diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index 0f8038918..bab87f7c6 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -53,7 +53,7 @@ labels:
 
 pod:
   test_pod:
-    wait_timeout: 120
+    wait_timeout: 600
     rbd:
       name: rbd-prov-test-pod
       pvc_name: rbd-prov-test-pvc
diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml
index 6ac0db288..79aeddcc7 100644
--- a/tools/deployment/armada/manifests/armada-lma.yaml
+++ b/tools/deployment/armada/manifests/armada-lma.yaml
@@ -61,6 +61,9 @@ data:
   chart_name: osh-infra-ceph-config
   release: osh-infra-ceph-config
   namespace: osh-infra
+  test:
+    enabled: true
+    timeout: 600
   wait:
     timeout: 1800
     labels:
diff --git a/tools/deployment/multinode/035-ceph-ns-activate.sh b/tools/deployment/multinode/035-ceph-ns-activate.sh
index b0c432b63..1a869334a 100755
--- a/tools/deployment/multinode/035-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/035-ceph-ns-activate.sh
@@ -51,4 +51,4 @@ helm upgrade --install ceph-osh-infra-config ./ceph-provisioners \
 #NOTE: Validate Deployment info
 helm status ceph-osh-infra-config
 
-helm test ceph-osh-infra-config
+helm test ceph-osh-infra-config --timeout 600
diff --git a/tools/deployment/openstack-support/025-ceph-ns-activate.sh b/tools/deployment/openstack-support/025-ceph-ns-activate.sh
index d758d802c..10371488a 100755
--- a/tools/deployment/openstack-support/025-ceph-ns-activate.sh
+++ b/tools/deployment/openstack-support/025-ceph-ns-activate.sh
@@ -50,7 +50,7 @@ helm upgrade --install ceph-openstack-config ./ceph-provisioners \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-helm test ceph-openstack-config
+helm test ceph-openstack-config --timeout 600
 
 #NOTE: Validate Deployment info
 kubectl get -n openstack jobs --show-all
diff --git a/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh b/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh
index c2d4c7e85..fe8a58714 100755
--- a/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh
+++ b/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh
@@ -50,7 +50,7 @@ helm upgrade --install ceph-osh-infra-config ./ceph-provisioners \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh osh-infra
 
-helm test ceph-osh-infra-config
+helm test ceph-osh-infra-config --timeout 600
 
 #NOTE: Validate Deployment info
 kubectl get -n osh-infra jobs --show-all
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 61008023e..e22d63b90 100755
--- a/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh
+++ b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh
@@ -76,4 +76,4 @@ helm upgrade --install tenant-ceph-openstack-config ./ceph-provisioners \
 #NOTE: Validate Deployment info
 helm status tenant-ceph-openstack-config
 
-helm test tenant-ceph-openstack-config
+helm test tenant-ceph-openstack-config --timeout 600