diff --git a/roles/osh-run-script-set/tasks/main.yaml b/roles/osh-run-script-set/tasks/main.yaml
index ef7841cdd..a6adec543 100644
--- a/roles/osh-run-script-set/tasks/main.yaml
+++ b/roles/osh-run-script-set/tasks/main.yaml
@@ -38,7 +38,6 @@
         OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}"
         CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}"
         CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}"
-        FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"
         FEATURES: "{{ osh_params.feature_gates | default('') | regex_replace(',', ' ')  }} {{ osh_params.openstack_release | default('') }} {{ osh_params.container_distro_name | default('') }}_{{ osh_params.container_distro_version | default('') }} {{ osh_params.container_distro_name | default('') }}"
         RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}"
       # NOTE(aostapenko) using bigger than async_status timeout due to async_status issue with
diff --git a/roles/osh-run-script/tasks/main.yaml b/roles/osh-run-script/tasks/main.yaml
index 7ea2c4df8..ba085fa16 100644
--- a/roles/osh-run-script/tasks/main.yaml
+++ b/roles/osh-run-script/tasks/main.yaml
@@ -35,7 +35,6 @@
     OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}"
     CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}"
     CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}"
-    FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"
     FEATURES: "{{ osh_params.feature_gates | default('') | regex_replace(',', ' ')  }} {{ osh_params.openstack_release | default('') }} {{ osh_params.container_distro_name | default('') }}_{{ osh_params.container_distro_version | default('') }} {{ osh_params.container_distro_name | default('') }}"
     RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}"
 ...
diff --git a/tools/deployment/common/rabbitmq.sh b/tools/deployment/common/rabbitmq.sh
index ccafa0dcf..228f69e92 100755
--- a/tools/deployment/common/rabbitmq.sh
+++ b/tools/deployment/common/rabbitmq.sh
@@ -25,7 +25,7 @@ helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
     --namespace=${NAMESPACE} \
     --set pod.replicas.server=1 \
     --timeout=600s \
-    ${VOLUME_HELM_ARGS:="--set volume.enabled=false"} \
+    ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path.enabled=true"} \
     ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
     ${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ}
 
diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 2b4ce4245..a6374e747 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -16,7 +16,7 @@ set -xe
 
 sudo -H mkdir -p /etc/openstack
 sudo -H chown -R $(id -un): /etc/openstack
-FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
   tee /etc/openstack/clouds.yaml << EOF
   clouds:
     openstack_helm:
diff --git a/tools/deployment/monitoring/grafana.sh b/tools/deployment/monitoring/grafana.sh
index bd2005253..73f6e2da2 100755
--- a/tools/deployment/monitoring/grafana.sh
+++ b/tools/deployment/monitoring/grafana.sh
@@ -16,8 +16,8 @@ set -xe
 
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
 : ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-FEATURE_GATES="calico ceph containers coredns elasticsearch kubernetes nginx nodes openstack prometheus home_dashboard persistentvolume apparmor"
-: ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c grafana ${FEATURE_GATES} ${FEATURES} 2>/dev/null)}
+FEATURES="calico ceph containers coredns elasticsearch kubernetes nginx nodes openstack prometheus home_dashboard persistentvolume apparmor ${FEATURES}"
+: ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c grafana ${FEATURES} 2>/dev/null)}
 
 #NOTE: Deploy command
 helm upgrade --install grafana ${OSH_INFRA_HELM_REPO}/grafana \
diff --git a/tools/deployment/monitoring/prometheus.sh b/tools/deployment/monitoring/prometheus.sh
index 2dfa20b36..00fa49a14 100755
--- a/tools/deployment/monitoring/prometheus.sh
+++ b/tools/deployment/monitoring/prometheus.sh
@@ -16,8 +16,8 @@ set -xe
 
 : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
 : ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"}
-FEATURE_GATES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor"
-: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus ${FEATURE_GATES} ${FEATURES})"}
+FEATURES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor ${FEATURES}"
+: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus ${FEATURES})"}
 
 #NOTE: Deploy command
 helm upgrade --install prometheus ${OSH_INFRA_HELM_REPO}/prometheus \
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 74cddbeeb..e2d50abda 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -303,12 +303,10 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/ingress.sh
-        - ./tools/deployment/ceph/ceph-rook.sh
-        - ./tools/deployment/ceph/ceph-adapter-rook.sh
         - ./tools/deployment/common/setup-client.sh
         - |
           export NAMESPACE=openstack
-          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 ${OSH_INFRA_EXTRA_HELM_ARGS}"
+          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 --set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true ${OSH_INFRA_EXTRA_HELM_ARGS}"
           export RUN_HELM_TESTS=no
           ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/common/rabbitmq.sh
@@ -336,12 +334,10 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/ingress.sh
-        - ./tools/deployment/ceph/ceph-rook.sh
-        - ./tools/deployment/ceph/ceph-adapter-rook.sh
         - ./tools/deployment/common/setup-client.sh
         - |
           export NAMESPACE=openstack
-          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 ${OSH_INFRA_EXTRA_HELM_ARGS}"
+          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 --set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true ${OSH_INFRA_EXTRA_HELM_ARGS}"
           export RUN_HELM_TESTS=no
           ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/common/rabbitmq.sh