diff --git a/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml b/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
index aefdac083..8c62b9a19 100644
--- a/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
+++ b/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
@@ -88,6 +88,8 @@ data:
         parameters:
           userSecretName: pvc-tceph-client-key
           adminSecretNamespace: tenant-ceph
+    manifests:
+      helm_tests: false
   dependencies:
     - tenant-ceph-htk
 ...
diff --git a/global/software/charts/ucp/ceph/ceph-provisioners.yaml b/global/software/charts/ucp/ceph/ceph-provisioners.yaml
index 4ff70e897..c4b8795e7 100644
--- a/global/software/charts/ucp/ceph/ceph-provisioners.yaml
+++ b/global/software/charts/ucp/ceph/ceph-provisioners.yaml
@@ -85,7 +85,7 @@ data:
         namespace: ceph
     deployment:
       ceph: true
-      client_secrets: true
+      client_secrets: false
       rbd_provisioner: true
       cephfs_provisioner: true
     bootstrap:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 9ab53153e..57d6516b9 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -353,32 +353,32 @@ data:
         type: git
       ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 596732f16bf7cfe681ce0bb2d62e529bea5eea82
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-rgw
         type: git
       deckhand:
@@ -503,32 +503,32 @@ data:
         type: git
       tenant-ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 596732f16bf7cfe681ce0bb2d62e529bea5eea82
+        reference: 20f4274aeec1a0d826dc43c191b56c67de06781a
         subpath: ceph-rgw
         type: git
       tiller: