diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index 102d72e..2208741 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -18,7 +18,7 @@ cinder_catalog_info = volume:cinder:internalURL
 show_multiple_locations = True
 
 [database]
-connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address('mariadb') }}/{{ glance.db.name }}
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
 max_retries = -1
 
 [keystone_authtoken]
diff --git a/service/files/glance-registry.conf.j2 b/service/files/glance-registry.conf.j2
index 146d66b..ef7e83f 100644
--- a/service/files/glance-registry.conf.j2
+++ b/service/files/glance-registry.conf.j2
@@ -15,7 +15,7 @@ cinder_catalog_info = volume:cinder:internalURL
 show_multiple_locations = True
 
 [database]
-connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address('mariadb') }}/{{ glance.db.name }}
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
 max_retries = -1
 
 [keystone_authtoken]
diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index d79f527..9634d4a 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -14,10 +14,10 @@ service:
       pre:
         - name: glance-db-create
           dependencies:
-            - mariadb
+            - {{ service.database }}
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e "create database {{ glance.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ glance.db.name }};
             grant all privileges on {{ glance.db.name }}.* to '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}';"
         - name: glance-db-sync
           files: