Update to allow HOST to be passed in