diff --git a/roles/keystone/tasks/main.yml b/roles/keystone/tasks/main.yml
index e6c49ea..eedfce3 100644
--- a/roles/keystone/tasks/main.yml
+++ b/roles/keystone/tasks/main.yml
@@ -23,7 +23,7 @@
 
 - name: install service file.
   template:
-    src: files/keystone.service
+    src: templates/keystone.service
     dest: /etc/systemd/system/keystone.service
     mode: 644
     owner: root
@@ -42,7 +42,8 @@
 
 - name: keystone manage commands to setup db
   command: >
-             /usr/bin/docker run --rm --add-host="mariadb:172.23.38.125"
+             /usr/bin/docker run --rm
+             --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }}
              -v /srv/keystone/fernet-keys:/etc/keystone/fernet-keys
              hpc/keystone keystone-manage {{ item }}
   with_items:
diff --git a/roles/keystone/files/keystone.service b/roles/keystone/templates/keystone.service
similarity index 50%
rename from roles/keystone/files/keystone.service
rename to roles/keystone/templates/keystone.service
index 14ff0f0..994b6df 100644
--- a/roles/keystone/files/keystone.service
+++ b/roles/keystone/templates/keystone.service
@@ -2,15 +2,17 @@
 Description=Openstack Keystone Container
 After=docker.service
 Requires=docker.service
- 
+
 [Service]
 TimeoutStartSec=0
 Restart=always
 ExecStartPre=-/usr/bin/docker stop %n
 ExecStartPre=-/usr/bin/docker rm %n
-ExecStart=/usr/bin/docker run --name %n --add-host="mariadb:172.23.38.125" \
-  -p 5001:5000 -p 35357:35357  hpc/keystone \
-  -v /srv/keystone/fernet-keys:/etc/keystone/fernet-keys
- 
+ExecStart=/usr/bin/docker run --name %n \
+  --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }} \
+  -p 5001:5000 -p 35357:35357 \
+  -v /srv/keystone/fernet-keys:/etc/keystone/fernet-keys \
+  hpc/keystone
+
 [Install]
 WantedBy=multi-user.target