diff --git a/worker_host/travis_worker/metadata.rb b/worker_host/travis_worker/metadata.rb
index 9b565804d..8c9e478d0 100644
--- a/worker_host/travis_worker/metadata.rb
+++ b/worker_host/travis_worker/metadata.rb
@@ -2,5 +2,5 @@
 maintainer_email "mathias@travis-ci.org"
 license          "Apache 2.0"
 description      "Installs/Configures the Travis Worker"
-version          "0.5.2"
+version          "0.5.3"
 depends "runit"
diff --git a/worker_host/travis_worker/recipes/bluebox.rb b/worker_host/travis_worker/recipes/bluebox.rb
index add569366..5dac25e4e 100644
--- a/worker_host/travis_worker/recipes/bluebox.rb
+++ b/worker_host/travis_worker/recipes/bluebox.rb
@@ -28,7 +28,7 @@
   worker_name = "#{app}.#{node[:fqdn]}"
   home = "#{node[:travis][:worker][:home]}/#{app}"
   service_name = "travis-worker-#{worker}"
-  host_name = "#{worker}.#{node[:travis][:worker][:hostname]}"
+  host_name = "#{node[:travis][:worker][:hostname]}-#{worker}.#{node[:travis][:worker][:domain]}"
 
   service service_name do
     action :nothing