diff --git a/roles/nova-management/templates/nova-controller.service b/roles/nova-management/templates/nova-controller.service
index ff41d17..faa6b2e 100644
--- a/roles/nova-management/templates/nova-controller.service
+++ b/roles/nova-management/templates/nova-controller.service
@@ -6,11 +6,11 @@ Requires=docker.service
 [Service]
 TimeoutStartSec=0
 Restart=always
-ExecStartPre=-/usr/bin/docker stop %n
-ExecStartPre=-/usr/bin/docker rm %n
+ExecStartPre=-/usr/bin/docker rm -f %n
 ExecStart=/usr/bin/docker run --name %n \
   --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }} \
   --add-host=controller:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
+  --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
   -p 8774:8774 \
   -p 8778:8778 \
   hpc/novacontroller /etc/run.sh