diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml
index 72e87f00c..d311565dc 100644
--- a/ceph-mon/templates/job-storage-admin-keys.yaml
+++ b/ceph-mon/templates/job-storage-admin-keys.yaml
@@ -85,7 +85,7 @@ spec:
             - name: CEPH_KEYRING_ADMIN_NAME
               value: {{ .Values.secrets.keyrings.admin }}
             - name: CEPH_STORAGECLASS_ADMIN_SECRET_NAME
-              value: {{ .Values.storageclass.rbd.admin_secret_name }}
+              value: {{ .Values.storageclass.rbd.parameters.adminSecretName }}
           command:
             - /tmp/keys-storage-keyring-manager.sh
           volumeMounts:
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index eaf4d7e28..846ef1e20 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -224,28 +224,35 @@ bootstrap:
 # if you change provision_storage_class to false
 # it is presumed you manage your own storage
 # class definition externally
+# We iterate over each storageclass parameters
+# and derive the manifest.
 storageclass:
   rbd:
     provision_storage_class: true
     provisioner: ceph.com/rbd
-    name: general
-    monitors: null
-    pool: rbd
-    admin_id: admin
-    admin_secret_name: pvc-ceph-conf-combined-storageclass
-    admin_secret_namespace: ceph
-    user_id: admin
-    user_secret_name: pvc-ceph-client-key
-    image_format: "2"
-    image_features: layering
+    ceph_configmap_name: ceph-etc
+    metadata:
+      default_storage_class: true
+      name: general
+    parameters:
+      pool: rbd
+      adminId: admin
+      adminSecretName: pvc-ceph-conf-combined-storageclass
+      adminSecretNamespace: ceph
+      userId: admin
+      userSecretName: pvc-ceph-client-key
+      imageFormat: "2"
+      imageFeatures: layering
   cephfs:
     provision_storage_class: true
     provisioner: ceph.com/cephfs
-    name: cephfs
-    admin_id: admin
-    user_secret_name: pvc-ceph-cephfs-client-key
-    admin_secret_name: pvc-ceph-conf-combined-storageclass
-    admin_secret_namespace: ceph
+    metadata:
+      name: cephfs
+    parameters:
+      adminId: admin
+      userSecretName: pvc-ceph-cephfs-client-key
+      adminSecretName: pvc-ceph-conf-combined-storageclass
+      adminSecretNamespace: ceph
 
 endpoints:
   cluster_domain_suffix: cluster.local
diff --git a/tools/deployment/tenant-ceph/040-tenant-ceph.sh b/tools/deployment/tenant-ceph/040-tenant-ceph.sh
index 6f971994b..e485b2464 100755
--- a/tools/deployment/tenant-ceph/040-tenant-ceph.sh
+++ b/tools/deployment/tenant-ceph/040-tenant-ceph.sh
@@ -76,16 +76,20 @@ storageclass:
   rbd:
     ceph_configmap_name: tenant-ceph-etc
     provision_storage_class: false
-    name: tenant-rbd
-    admin_secret_name: pvc-tenant-ceph-conf-combined-storageclass
-    admin_secret_namespace: tenant-ceph
-    user_secret_name: pvc-tenant-ceph-client-key
+    metadata:
+      name: tenant-rbd
+    parameters:
+      adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
+      adminSecretNamespace: tenant-ceph
+      userSecretName: pvc-tenant-ceph-client-key
   cephfs:
     provision_storage_class: false
-    name: cephfs
-    user_secret_name: pvc-tenant-ceph-cephfs-client-key
-    admin_secret_name: pvc-tenant-ceph-conf-combined-storageclass
-    admin_secret_namespace: tenant-ceph
+    metadata:
+      name: cephfs
+    parameters:
+      adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
+      adminSecretNamespace: tenant-ceph
+      userSecretName: pvc-tenant-ceph-cephfs-client-key
 bootstrap:
   enabled: true
 jobs:
diff --git a/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh
index cf087d100..bb20dc5dd 100755
--- a/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh
+++ b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh
@@ -49,16 +49,20 @@ storageclass:
   rbd:
     ceph_configmap_name: tenant-ceph-etc
     provision_storage_class: false
-    name: tenant-rbd
-    admin_secret_name: pvc-tenant-ceph-conf-combined-storageclass
-    admin_secret_namespace: tenant-ceph
-    user_secret_name: pvc-tenant-ceph-client-key
+    metadata:
+      name: tenant-rbd
+    parameters:
+      adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
+      adminSecretNamespace: tenant-ceph
+      userSecretName: pvc-tenant-ceph-client-key
   cephfs:
     provision_storage_class: false
-    name: cephfs
-    admin_secret_name: pvc-tenant-ceph-conf-combined-storageclass
-    admin_secret_namespace: tenant-ceph
-    user_secret_name: pvc-tenant-ceph-cephfs-client-key
+    metadata:
+      name: cephfs
+    parameters:
+      adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
+      adminSecretNamespace: tenant-ceph
+      userSecretName: pvc-tenant-ceph-cephfs-client-key
 EOF
 helm upgrade --install tenant-ceph-openstack-config ./ceph-provisioners \
   --namespace=openstack \
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 25f727c9e..4925d0f35 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -53,6 +53,7 @@
         #- openstack-helm-infra-five-fedora
         #NOTE(srwilkers): Disable centos experimental jobs until issues resolved
         #- openstack-helm-infra-five-centos
+        - openstack-helm-infra-tenant-ceph
         - openstack-helm-infra-elastic-beats
         - openstack-helm-infra-armada-deploy
         - openstack-helm-infra-armada-update-uuid