diff --git a/ceph-client/templates/bin/_helm-tests.sh.tpl b/ceph-client/templates/bin/_helm-tests.sh.tpl
index b79e277d1..1fb57b286 100755
--- a/ceph-client/templates/bin/_helm-tests.sh.tpl
+++ b/ceph-client/templates/bin/_helm-tests.sh.tpl
@@ -32,11 +32,9 @@ function check_cluster_status() {
 
 function check_osd_count() {
   echo "#### Start: Checking OSD count ####"
-  osd_stat_output=$(ceph osd stat -f json-pretty)
-
-  num_osd=$(echo $osd_stat_output | jq .num_osds)
-  num_in_osds=$(echo $osd_stat_output | jq .num_in_osds)
-  num_up_osds=$(echo $osd_stat_output | jq .num_up_osds)
+  num_osd=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n1)
+  num_in_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | tail -n1)
+  num_up_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n2 | tail -n1)
   if [ $EXPECTED_OSDS == 1 ]; then
     MIN_EXPECTED_OSDS=$EXPECTED_OSDS
   else
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index c3f9ab8d6..9a8a6e5f2 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -25,11 +25,11 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
-    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
+    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index 9444112a2..bc9695952 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -24,10 +24,10 @@ deployment:
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
-    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
+    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-osd/templates/bin/_helm-tests.sh.tpl b/ceph-osd/templates/bin/_helm-tests.sh.tpl
index 7e125ff38..b818f1fd9 100644
--- a/ceph-osd/templates/bin/_helm-tests.sh.tpl
+++ b/ceph-osd/templates/bin/_helm-tests.sh.tpl
@@ -20,10 +20,9 @@ set -ex
 
 function check_osd_count() {
   echo "#### Start: Checking OSD count ####"
-  osd_stat_output=$(ceph osd stat -f json-pretty)
-  num_osd=$(echo $osd_stat_output | jq .num_osds)
-  num_in_osds=$(echo $osd_stat_output | jq .num_in_osds)
-  num_up_osds=$(echo $osd_stat_output | jq .num_up_osds)
+  num_osd=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n1)
+  num_in_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | tail -n1)
+  num_up_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n2 | tail -n1)
 
   if [ ${num_osd} -eq 1 ]; then
     MIN_OSDS=${num_osd}
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 59ec192a2..fefe0cca4 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -20,9 +20,9 @@
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
+    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index 6e4b26d32..f64053e6b 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -28,10 +28,10 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_bionic-20200217'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
-    ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_bionic-20200217'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_bionic-20200416'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
+    ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_bionic-20200416'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index e4d99a31d..5cd6e4e5f 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -25,12 +25,12 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
-    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
+    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200416'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/docker:17.07.0'
-    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
+    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416'
     ks_endpoints: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'
     ks_service: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'
     ks_user: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'
diff --git a/tools/deployment/openstack-support/025-ceph-ns-activate.sh b/tools/deployment/openstack-support/025-ceph-ns-activate.sh
index 52ccc2873..87009df3d 100755
--- a/tools/deployment/openstack-support/025-ceph-ns-activate.sh
+++ b/tools/deployment/openstack-support/025-ceph-ns-activate.sh
@@ -40,9 +40,6 @@ bootstrap:
 conf:
   rgw_ks:
     enabled: false
-storageclass:
-  cephfs:
-    provision_storage_class: false
 EOF
 
 : ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)"}
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 0e87a5800..ab8eac56b 100755
--- a/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh
+++ b/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh
@@ -40,9 +40,6 @@ bootstrap:
 conf:
   rgw_ks:
     enabled: false
-storageclass:
-  cephfs:
-    provision_storage_class: false
 EOF
 
 : ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)"}