diff --git a/service/files/backup.sh.j2 b/service/files/backup.sh.j2
index 0d8e930..0be31d6 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/keystone/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 {{ keystone.db.username }} -p{{ keystone.db.password }} \
     --single-transaction {{ keystone.db.name }} > "${BACKUP_FILE}"
diff --git a/service/files/keystone.conf.j2 b/service/files/keystone.conf.j2
index 763fdf1..5a25291 100644
--- a/service/files/keystone.conf.j2
+++ b/service/files/keystone.conf.j2
@@ -8,7 +8,7 @@ notification_format = {{ keystone.notifications.format }}
 {% endif %}
 
 [database]
-connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address(service.database) }}/{{ keystone.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address("database") }}/{{ keystone.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 max_overflow = 60
 
diff --git a/service/keystone.yaml b/service/keystone.yaml
index 9298117..4d92579 100644
--- a/service/keystone.yaml
+++ b/service/keystone.yaml
@@ -38,10 +38,10 @@ service:
             - fernet-manage
         - name: keystone-db-create
           dependencies:
-            - {{ service.database }}
+            - database
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ keystone.db.name }};
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ keystone.db.name }};
             create user '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
             {% if db.tls.enabled %} require ssl {% endif %};
             grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'
@@ -75,7 +75,7 @@ service:
         dependencies:
           - memcached
           # {% if keystone.notifications.enable -%}
-          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
+          - notifications
           # {%- endif %}
         files:
           - keystone-conf