diff --git a/service/files/heat.conf.j2 b/service/files/heat.conf.j2
index 206b7ed..fb82f5b 100644
--- a/service/files/heat.conf.j2
+++ b/service/files/heat.conf.j2
@@ -7,7 +7,7 @@ region_name_for_services = RegionOne
 rpc_backend = rabbit
 
 [database]
-connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address('mariadb') }}/{{ heat.db.name }}
+connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}
 
 [oslo_messaging_rabbit]
 rabbit_userid = {{ rabbitmq.user }}
diff --git a/service/heat-api.yaml b/service/heat-api.yaml
index f09ee66..dabfb60 100644
--- a/service/heat-api.yaml
+++ b/service/heat-api.yaml
@@ -14,10 +14,10 @@ service:
       pre:
         - name: heat-db-create
           dependencies:
-            - mariadb
+            - {{ service.database }}
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e "create database {{ heat.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ heat.db.name }};
             grant all privileges on {{ heat.db.name }}.* to '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}';"
         - name: heat-db-sync
           files: