diff --git a/service/files/ironic.conf.j2 b/service/files/ironic.conf.j2
index bb8bdf9..a85ba55 100644
--- a/service/files/ironic.conf.j2
+++ b/service/files/ironic.conf.j2
@@ -16,7 +16,7 @@ host_ip = {{ network_topology["private"]["address"] }}
 port = {{ ironic.api_port.cont }}
 
 [database]
-connection = mysql+pymysql://{{ ironic.db.username }}:{{ ironic.db.password }}@{{ address(service.database) }}/{{ ironic.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ ironic.db.username }}:{{ ironic.db.password }}@{{ address("database") }}/{{ ironic.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
 {{ keystone_authtoken.keystone_authtoken(ironic.username, ironic.password) }}
diff --git a/service/ironic-api.yaml b/service/ironic-api.yaml
index 1706b46..f36ebc6 100644
--- a/service/ironic-api.yaml
+++ b/service/ironic-api.yaml
@@ -15,13 +15,13 @@ service:
       pre:
         - name: ironic-db-create
           type: single
-          command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database `{{ ironic.db.name }}`;
+          command: mysql -v -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database `{{ ironic.db.name }}`;
                    create user '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
                    {% if db.tls.enabled %} require ssl {% endif %};
                    grant all privileges on `{{ ironic.db.name }}`.* to '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
                    {% if db.tls.enabled %} require ssl {% endif %};"
           dependencies:
-            - {{ service.database }}
+            - database
         - name: ironic-db-sync
           type: single
           command: ironic-dbsync
@@ -68,7 +68,7 @@ service:
         files:
           - ironic.conf
         dependencies:
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - rpc
 files:
   ironic.conf:
     path: /etc/ironic/ironic.conf