diff --git a/service/files/backup.sh.j2 b/service/files/backup.sh.j2
index 34e2b46..9911034 100644
--- a/service/files/backup.sh.j2
+++ b/service/files/backup.sh.j2
@@ -1,10 +1,10 @@
 #!/bin/bash -ex
 set -o pipefail
 BACKUP_FILE="/var/ccp/backup/nova/backup-$(date "+%Y%m%d%H%M%S").sql"
-mysqldump {% if percona.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
+mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
     -u {{ nova.db.username }} -p{{ nova.db.password }} \
     --single-transaction {{ nova.db.name }} > "${BACKUP_FILE}"
 BACKUP_FILE_API="/var/ccp/backup/nova/backup-$(date "+%Y%m%d%H%M%S")-api.sql"
-mysqldump {% if percona.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
+mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
     -u {{ nova.db.username }} -p{{ nova.db.password }} \
     --single-transaction {{ nova.db.api_name }} > "${BACKUP_FILE_API}"
diff --git a/service/files/nova.conf.j2 b/service/files/nova.conf.j2
index b6497d8..75ec3a5 100644
--- a/service/files/nova.conf.j2
+++ b/service/files/nova.conf.j2
@@ -112,13 +112,13 @@ username = {{ neutron.username }}
 password = {{ neutron.password }}
 
 [database]
-connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_pool_size = 50
 max_overflow = 1000
 max_retries = -1
 
 [api_database]
-connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.api_name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address(service.database) }}/{{ nova.db.api_name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
 [cache]
diff --git a/service/nova-api.yaml b/service/nova-api.yaml
index 63f1ff9..69771c8 100644
--- a/service/nova-api.yaml
+++ b/service/nova-api.yaml
@@ -17,11 +17,11 @@ service:
           command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e 'create database `{{ nova.db.name }}`;
                    create database `{{ nova.db.api_name }}`;
                    create user "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
-                   {% if percona.tls.enabled %} require ssl {% endif %};
+                   {% if db.tls.enabled %} require ssl {% endif %};
                    grant all privileges on `{{ nova.db.name }}`.* to "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
-                   {% if percona.tls.enabled %} require ssl {% endif %};
+                   {% if db.tls.enabled %} require ssl {% endif %};
                    grant all privileges on `{{ nova.db.api_name }}`.* to "{{ nova.db.username }}"@"%" identified by "{{ nova.db.password }}"
-                   {% if percona.tls.enabled %} require ssl {% endif %};'
+                   {% if db.tls.enabled %} require ssl {% endif %};'
           dependencies:
             - {{ service.database }}
           files: