diff --git a/roles/ci_dcn_site/templates/service-values.yaml.j2 b/roles/ci_dcn_site/templates/service-values.yaml.j2
index 4c4d684c37..321eaebfa8 100644
--- a/roles/ci_dcn_site/templates/service-values.yaml.j2
+++ b/roles/ci_dcn_site/templates/service-values.yaml.j2
@@ -94,13 +94,15 @@ data:
 {% endif %}
 {% endfor %}
   manila:
-    enabled: false
+    enabled: true
     manilaAPI:
       customServiceConfig: |
         [DEFAULT]
         enabled_share_protocols=nfs,cephfs
+{% for _ceph in _ceph_vars_list %}
+      {{ _ceph.cifmw_ceph_client_cluster }}:
     manilaShares:
-      share1:
+      share{{ loop.index }}:
         customServiceConfig: |
           [DEFAULT]
           enabled_share_backends = cephfs
@@ -114,6 +116,8 @@ data:
           cephfs_auth_id=openstack
           cephfs_volume_mode = 0755
           cephfs_protocol_helper_type = CEPHFS
+          storage_availability_zone = {{ _ceph.cifmw_ceph_client_cluster }}
+{% endfor %}
   neutron:
       template:
         customServiceConfig: |