diff --git a/roles/glance-controller/tasks/main.yml b/roles/glance-controller/tasks/main.yml
index 503be35..552919a 100644
--- a/roles/glance-controller/tasks/main.yml
+++ b/roles/glance-controller/tasks/main.yml
@@ -39,7 +39,6 @@
   command: >
              /usr/bin/docker run --rm
              {{ env_vars }}
-             --add-host=nova-controller:{{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }} \
              --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
              {{ docker_image }} /etc/bootstrap.sh
   tags: bootstrap
diff --git a/roles/horizon/templates/horizon.service b/roles/horizon/templates/horizon.service
index 6499be4..9f1a843 100644
--- a/roles/horizon/templates/horizon.service
+++ b/roles/horizon/templates/horizon.service
@@ -10,9 +10,7 @@ ExecStartPre=-/usr/bin/docker rm -f %n
 ExecStart=/usr/bin/docker run --name %n \
   -e "MEMCACHED_SERVER={{ hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address'] }}" \
   -e "KEYSTONE_HOST={{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }}" \
-  --add-host=nova-controller:{{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }} \
   --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
-  --add-host=neutron-controller:{{ hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['address'] }} \
   -p 80:80 \
   {{ docker_image }}
 
diff --git a/roles/neutron-controller/templates/neutron-controller.service b/roles/neutron-controller/templates/neutron-controller.service
index d23a65b..9473311 100644
--- a/roles/neutron-controller/templates/neutron-controller.service
+++ b/roles/neutron-controller/templates/neutron-controller.service
@@ -10,7 +10,6 @@ ExecStartPre=-/usr/bin/docker rm -f %n
 ExecStart=/usr/bin/docker run --name %n \
   {{ env_vars | replace('\n', '') }} \
   --add-host=nova-controller:{{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }} \
-  --add-host=neutron-controller:{{ hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['address'] }} \
   --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }} \
   --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
   --privileged \
diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service
index 56bfe9c..08adf9f 100644
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -27,7 +27,6 @@ ExecStart=/usr/bin/docker run --name %n \
     -e "NOVA_CONTROLLER_HOST={{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }}" \
     -e "PROVIDER_INTERFACE_NAME={{ hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['interface'] }}" \
     -e "GLANCE_CONTROLLER_HOST={{ hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address'] }}" \
-    --add-host=nova-controller:{{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }} \
     --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
     --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }} \
     --privileged \