diff --git a/service/files/backup.sh.j2 b/service/files/backup.sh.j2
index 1f57758..958aa5a 100644
--- a/service/files/backup.sh.j2
+++ b/service/files/backup.sh.j2
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 set -o pipefail
 BACKUP_FILE="/var/ccp/backup/glance/backup-$(date "+%Y%m%d%H%M%S").sql"
-mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
+mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \
     -u {{ glance.db.username }} -p{{ glance.db.password }} \
     --single-transaction {{ glance.db.name }} > "${BACKUP_FILE}"
diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index f5ecd28..d28b35f 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -16,7 +16,7 @@ show_image_direct_url = true
 show_multiple_locations = true
 
 [database]
-connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address("database") }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
 {{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}
diff --git a/service/files/glance-registry.conf.j2 b/service/files/glance-registry.conf.j2
index 92104cd..118a32f 100644
--- a/service/files/glance-registry.conf.j2
+++ b/service/files/glance-registry.conf.j2
@@ -9,7 +9,7 @@ bind_host = {{ network_topology["private"]["address"] }}
 bind_port = {{ glance.registry_port.cont }}
 
 [database]
-connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address("database") }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
 {{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}
diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index adf6a39..a14a7f2 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -13,10 +13,10 @@ service:
       pre:
         - name: glance-db-create
           dependencies:
-            - {{ service.database }}
+            - database
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ glance.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ glance.db.name }};
             create user '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}'
             {% if db.tls.enabled %} require ssl {% endif %};
             grant all privileges on {{ glance.db.name }}.* to '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}'