diff --git a/roles/ci_dcn_site/templates/service-values.yaml.j2 b/roles/ci_dcn_site/templates/service-values.yaml.j2
index 4c4d684c37..5bed7a61b8 100644
--- a/roles/ci_dcn_site/templates/service-values.yaml.j2
+++ b/roles/ci_dcn_site/templates/service-values.yaml.j2
@@ -10,11 +10,11 @@ data:
   preserveJobs: false
   cinder:
     uniquePodNames: false
-  cinderAPI:
-    replicas: 3
     customServiceConfig: |
       [DEFAULT]
-      default_availability_zone = az0
+      storage_availability_zone = az0
+  cinderAPI:
+    replicas: 3
   cinderBackup:
     replicas: 3
     customServiceConfig: |
@@ -23,7 +23,6 @@ data:
       backup_ceph_conf = /etc/ceph/az0.conf
       backup_ceph_pool = backups
       backup_ceph_user = openstack
-      storage_availability_zone = az0
   cinderVolumes:
 {% for _ceph in _ceph_vars_list %}
     {{ _ceph.cifmw_ceph_client_cluster }}: