diff --git a/roles/rails/tasks/web.yml b/roles/rails/tasks/web.yml
index 21a65b9..65f378e 100644
--- a/roles/rails/tasks/web.yml
+++ b/roles/rails/tasks/web.yml
@@ -8,4 +8,4 @@
   command: chdir=/root/wrestlingApp docker build -t wrestlingdev-web -f rails-prod-Dockerfile .
 
 - name: Start docker container
-  command: docker run -h $HOSTNAME -d --restart=always --env-file /root/prod.env -v /srv/docker/apache2/logs:/var/log/apache2  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 wrestlingdev-web
+  command: docker run -h {{ansible_hostname}} -d --restart=always --env-file /root/prod.env -v /srv/docker/apache2/logs:/var/log/apache2  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 wrestlingdev-web
diff --git a/roles/rails/tasks/worker.yml b/roles/rails/tasks/worker.yml
index d48fff3..4c28066 100644
--- a/roles/rails/tasks/worker.yml
+++ b/roles/rails/tasks/worker.yml
@@ -8,4 +8,4 @@
   command: chdir=/root/wrestlingApp docker build -t wrestlingdev-worker -f rails-prod-Dockerfile .
 
 - name: Start docker container
-  command: docker run -h $HOSTNAME -d --restart=always --env-file /root/prod.env -v /etc/localtime:/etc/localtime wrestlingdev-worker bundle exec rake jobs:work RAILS_ENV=production
+  command: docker run -h {{ansible_hostname}} -d --restart=always --env-file /root/prod.env -v /etc/localtime:/etc/localtime wrestlingdev-worker bundle exec rake jobs:work RAILS_ENV=production