diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml
index 0ac007d96a..86027f8849 100644
--- a/tools/docker-compose-cluster.yml
+++ b/tools/docker-compose-cluster.yml
@@ -13,6 +13,7 @@ services:
       - "1936:1936"
   tower_1:
     image: gcr.io/ansible-tower-engineering/tower_devel:${TAG}
+    hostname: tower_1
     environment:
       RABBITMQ_HOST: rabbitmq_1
       RABBITMQ_USER: guest
@@ -22,6 +23,7 @@ services:
       - "../:/tower_devel"
   tower_2:
     image: gcr.io/ansible-tower-engineering/tower_devel:${TAG}
+    hostname: tower_2
     environment:
       RABBITMQ_HOST: rabbitmq_2
       RABBITMQ_USER: guest
@@ -31,6 +33,7 @@ services:
       - "../:/tower_devel"
   tower_3:
     image: gcr.io/ansible-tower-engineering/tower_devel:${TAG}
+    hostname: tower_3
     environment:
       RABBITMQ_HOST: rabbitmq_3
       RABBITMQ_USER: guest
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index d3804a1c95..f34bb25766 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -3,11 +3,12 @@ services:
   # Primary Tower Development Container
   tower:
     image: gcr.io/ansible-tower-engineering/tower_devel:${TAG}
+    hostname: tower
     environment:
       RABBITMQ_HOST: rabbitmq
       RABBITMQ_USER: guest
       RABBITMQ_PASS: guest
-      RABBITMQ_VHOST: tower
+      RABBITMQ_VHOST: /
     ports:
       - "8080:8080"
       - "8013:8013"
@@ -24,10 +25,8 @@ services:
   # Postgres Database Container
   postgres:
     image: postgres:9.4.1
-
   memcached:
     image: memcached:alpine
-
   rabbitmq:
     image: rabbitmq:3-management
 
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 96812974fa..d0191dc2f4 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -4,7 +4,7 @@ set +x
 # Wait for the databases to come up
 ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all
 ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=memcached port=11211" all
-ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=rabbitmq port=5672" all
+ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=${RABBITMQ_HOST} port=5672" all
 
 # In case Tower in the container wants to connect to itself, use "docker exec" to attach to the container otherwise
 # TODO: FIX