diff --git a/tools/deployment/common/ingress.sh b/tools/deployment/common/ingress.sh
deleted file mode 100755
index 3b14d0f2fe..0000000000
--- a/tools/deployment/common/ingress.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-: ${HELM_INGRESS_NGINX_VERSION:="4.8.3"}
-
-helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-
-if ! [[ ${FEATURES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
-    #NOTE: Deploy cluster ingress
-    helm upgrade --install ingress-nginx-cluster ingress-nginx/ingress-nginx \
-    --version ${HELM_INGRESS_NGINX_VERSION} \
-    --namespace=kube-system \
-    --set controller.admissionWebhooks.enabled="false" \
-    --set controller.kind=DaemonSet \
-    --set controller.service.type=ClusterIP \
-    --set controller.scope.enabled="false" \
-    --set controller.hostNetwork="true" \
-    --set controller.ingressClassResource.name=nginx-cluster \
-    --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-cluster" \
-    --set controller.ingressClassResource.default="true" \
-    --set controller.ingressClass=nginx-cluster \
-    --set controller.labels.app=ingress-api
-
-    #NOTE: Wait for deploy
-    helm osh wait-for-pods kube-system
-fi
-
-#NOTE: Deploy namespace ingress
-helm upgrade --install ingress-nginx-openstack ingress-nginx/ingress-nginx \
-  --version ${HELM_INGRESS_NGINX_VERSION} \
-  --namespace=openstack \
-  --set controller.kind=DaemonSet \
-  --set controller.admissionWebhooks.enabled="false" \
-  --set controller.scope.enabled="true" \
-  --set controller.service.enabled="false" \
-  --set controller.ingressClassResource.name=nginx \
-  --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-openstack" \
-  --set controller.ingressClass=nginx \
-  --set controller.labels.app=ingress-api
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack
-
-helm upgrade --install ingress-nginx-ceph ingress-nginx/ingress-nginx \
-  --version ${HELM_INGRESS_NGINX_VERSION} \
-  --namespace=ceph \
-  --set controller.kind=DaemonSet \
-  --set controller.admissionWebhooks.enabled="false" \
-  --set controller.scope.enabled="true" \
-  --set controller.service.enabled="false" \
-  --set controller.ingressClassResource.name=nginx-ceph \
-  --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-ceph" \
-  --set controller.ingressClass=nginx-ceph \
-  --set controller.labels.app=ingress-api
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods ceph
diff --git a/tools/deployment/common/ldap.sh b/tools/deployment/common/ldap.sh
deleted file mode 100755
index d6b6d5d65e..0000000000
--- a/tools/deployment/common/ldap.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-: ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides -p ${OSH_VALUES_OVERRIDES_PATH} -c ldap ${FEATURES})"}
-: ${NAMESPACE:="osh-infra"}
-
-#NOTE: Deploy command
-helm upgrade --install ldap ${OSH_HELM_REPO}/ldap \
-    --namespace=${NAMESPACE} \
-    --set bootstrap.enabled=true \
-    ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_LDAP}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods ${NAMESPACE}
diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
deleted file mode 100755
index 524aab28cd..0000000000
--- a/tools/deployment/common/memcached.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-#NOTE: Define variables
-: ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c memcached ${FEATURES})"}
-
-#NOTE: Deploy command
-helm upgrade --install memcached ${OSH_HELM_REPO}/memcached \
-    --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS} \
-    ${OSH_EXTRA_HELM_ARGS_MEMCACHED}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack
diff --git a/tools/deployment/common/nfs-provisioner.sh b/tools/deployment/common/nfs-provisioner.sh
deleted file mode 100755
index 0fcb7b9fd3..0000000000
--- a/tools/deployment/common/nfs-provisioner.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-: ${OSH_HELM_REPO:="../openstack-helm"}
-
-tee /tmp/nfs-ns.yaml << EOF
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    kubernetes.io/metadata.name: nfs
-    name: nfs
-  name: nfs
-EOF
-
-kubectl create -f /tmp/nfs-ns.yaml
-
-#NOTE: Deploy nfs instance for logging, monitoring and alerting components
-tee /tmp/nfs-provisioner.yaml << EOF
-labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
-storageclass:
-  name: general
-EOF
-helm upgrade --install nfs-provisioner \
-    ${OSH_HELM_REPO}/nfs-provisioner --namespace=nfs \
-    --values=/tmp/nfs-provisioner.yaml
-
-#NOTE: Wait for deployment
-helm osh wait-for-pods nfs
diff --git a/tools/deployment/common/rabbitmq.sh b/tools/deployment/common/rabbitmq.sh
deleted file mode 100755
index 90bd285aa1..0000000000
--- a/tools/deployment/common/rabbitmq.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-#NOTE: Define variables
-: ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c rabbitmq ${FEATURES})"}
-: ${NAMESPACE:=openstack}
-
-#NOTE: Deploy command
-helm upgrade --install rabbitmq ${OSH_HELM_REPO}/rabbitmq \
-    --namespace=${NAMESPACE} \
-    --set pod.replicas.server=1 \
-    --timeout=600s \
-    ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path.enabled=true"} \
-    ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods ${NAMESPACE}
-
-helm test rabbitmq --namespace openstack
diff --git a/tools/deployment/component/common/ldap.sh b/tools/deployment/component/common/ldap.sh
index c27f6ef26a..cf3feba8b5 100755
--- a/tools/deployment/component/common/ldap.sh
+++ b/tools/deployment/component/common/ldap.sh
@@ -18,6 +18,7 @@ set -xe
 : ${OSH_HELM_REPO:="../openstack-helm"}
 : ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
 : ${OSH_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c ldap ${FEATURES})"}
+: ${NAMESPACE:=openstack}
 
 #NOTE: Deploy command
 tee /tmp/ldap.yaml <<EOF
@@ -31,10 +32,10 @@ storage:
     enabled: false
 EOF
 helm upgrade --install ldap ${OSH_HELM_REPO}/ldap \
-    --namespace=openstack \
+    --namespace=${NAMESPACE} \
     --values=/tmp/ldap.yaml \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_LDAP}
 
 #NOTE: Wait for deploy
-helm osh wait-for-pods openstack
+helm osh wait-for-pods ${NAMESPACE}
diff --git a/tools/deployment/component/common/mariadb.sh b/tools/deployment/component/common/mariadb.sh
deleted file mode 100755
index 69ad2864cc..0000000000
--- a/tools/deployment/component/common/mariadb.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-#NOTE: Define variables
-: ${OSH_HELM_REPO:="../openstack-helm"}
-: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
-: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c mariadb ${FEATURES})"}
-
-#NOTE: Deploy command
-helm upgrade --install mariadb ${OSH_HELM_REPO}/mariadb \
-    --namespace=openstack \
-    --set pod.replicas.server=1 \
-    ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true"} \
-    ${OSH_EXTRA_HELM_ARGS:=} \
-    ${OSH_EXTRA_HELM_ARGS_MARIADB}
-
-#NOTE: Wait for deploy
-helm osh wait-for-pods openstack
diff --git a/tools/deployment/component/common/memcached.sh b/tools/deployment/component/common/memcached.sh
index b12506f28a..993fdcec26 100755
--- a/tools/deployment/component/common/memcached.sh
+++ b/tools/deployment/component/common/memcached.sh
@@ -18,12 +18,13 @@ set -xe
 : ${OSH_HELM_REPO:="../openstack-helm"}
 : ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
 : ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c memcached ${FEATURES})"}
+: ${NAMESPACE:=openstack}
 
 #NOTE: Deploy command
 helm upgrade --install memcached ${OSH_HELM_REPO}/memcached \
-    --namespace=openstack \
+    --namespace=${NAMESPACE} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_MEMCACHED}
 
 #NOTE: Wait for deploy
-helm osh wait-for-pods openstack
+helm osh wait-for-pods ${NAMESPACE}
diff --git a/tools/deployment/component/common/rabbitmq.sh b/tools/deployment/component/common/rabbitmq.sh
index 796033761e..33ec709205 100755
--- a/tools/deployment/component/common/rabbitmq.sh
+++ b/tools/deployment/component/common/rabbitmq.sh
@@ -18,10 +18,11 @@ set -xe
 : ${OSH_HELM_REPO:="../openstack-helm"}
 : ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
 : ${OSH_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c rabbitmq ${FEATURES})"}
+: ${NAMESPACE:=openstack}
 
 #NOTE: Deploy command
 helm upgrade --install rabbitmq ${OSH_HELM_REPO}/rabbitmq \
-    --namespace=openstack \
+    --namespace=${NAMESPACE} \
     --set pod.replicas.server=1 \
     --timeout=600s \
     ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path.enabled=true"} \
@@ -29,4 +30,4 @@ helm upgrade --install rabbitmq ${OSH_HELM_REPO}/rabbitmq \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
 
 #NOTE: Wait for deploy
-helm osh wait-for-pods openstack
+helm osh wait-for-pods ${NAMESPACE}
diff --git a/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh b/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
index 5f19ea3789..bb51123fe3 100755
--- a/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
+++ b/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
@@ -18,24 +18,14 @@ set -xe
 : ${OSH_HELM_REPO:="../openstack-helm"}
 : ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
 : ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c nfs-provisioner ${FEATURES})"}
-
-tee /tmp/nfs-ns.yaml << EOF
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    kubernetes.io/metadata.name: nfs
-    name: nfs
-  name: nfs
-EOF
-
-kubectl create -f /tmp/nfs-ns.yaml
+: ${STORAGE_CLASS:="nfs-provisioner"}
+: ${NAMESPACE:=nfs}
 
 #NOTE: Deploy command
-helm upgrade --install nfs-provisioner ${OSH_HELM_REPO}/nfs-provisioner \
-    --namespace=nfs \
-    --set storageclass.name=general \
+helm upgrade --install --create-namespace nfs-provisioner ${OSH_HELM_REPO}/nfs-provisioner \
+    --namespace=${NAMESPACE} \
+    --set storageclass.name="${STORAGE_CLASS}" \
     ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER}
 
 #NOTE: Wait for deploy
-helm osh wait-for-pods nfs
+helm osh wait-for-pods ${NAMESPACE}
diff --git a/tools/deployment/component/tacker/tacker.sh b/tools/deployment/component/tacker/tacker.sh
index fbb3c3cf5f..daaaa741c8 100755
--- a/tools/deployment/component/tacker/tacker.sh
+++ b/tools/deployment/component/tacker/tacker.sh
@@ -18,10 +18,12 @@ set -xe
 : ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
 : ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c tacker ${FEATURES})"}
 : ${RUN_HELM_TESTS:="no"}
+: ${STORAGE_CLASS:="nfs-provisioner"}
 
 #NOTE: Deploy command
 helm upgrade --install tacker ${OSH_HELM_REPO}/tacker \
     --namespace=openstack \
+    --set storage.storageClass=${STORAGE_CLASS} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_TACKER}
 
diff --git a/tools/deployment/db/mariadb.sh b/tools/deployment/db/mariadb.sh
index 34a28730f8..bbcc387b16 100755
--- a/tools/deployment/db/mariadb.sh
+++ b/tools/deployment/db/mariadb.sh
@@ -14,16 +14,19 @@
 
 set -xe
 
+#NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
 : ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"}
 : ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c mariadb ${FEATURES})"}
-: ${NAMESPACE:="osh-infra"}
-: ${RUN_HELM_TESTS:="yes"}
+: ${NAMESPACE:="openstack"}
+: ${RUN_HELM_TESTS:="no"}
 
 #NOTE: Deploy command
 helm upgrade --install mariadb ${OSH_HELM_REPO}/mariadb \
     --namespace=${NAMESPACE} \
     ${MONITORING_HELM_ARGS:="--set monitoring.prometheus.enabled=true"} \
+    --set pod.replicas.server=1 \
+    ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true"} \
     --timeout=600s \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_MARIADB}
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index df2c35242e..776bd4598d 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -129,7 +129,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - export VOLUME_HELM_ARGS="--set volume.enabled=false"; ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -154,7 +154,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - export VOLUME_HELM_ARGS="--set volume.enabled=false"; ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -182,7 +182,7 @@
         - ./tools/deployment/ceph/ceph-rook.sh
         - ./tools/deployment/ceph/ceph-adapter-rook.sh
         - export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/rabbitmq.sh
-        - export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/mariadb.sh
+        - export VOLUME_HELM_ARGS=" "; ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/cinder/cinder.sh
@@ -206,7 +206,7 @@
         - ./tools/deployment/common/prepare-helm-repos-local.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -234,7 +234,7 @@
         - ./tools/deployment/common/prepare-helm-repos-public.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -259,7 +259,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -288,7 +288,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/common/cert-manager.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/common/ldap.sh
@@ -309,7 +309,7 @@
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/ceph/ceph.sh
         - ./tools/deployment/ceph/ceph-ns-activate.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/keystone/keystone.sh
@@ -333,7 +333,7 @@
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/ceph/ceph-rook.sh
         - ./tools/deployment/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/keystone/keystone.sh
@@ -386,7 +386,7 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/keystone/keystone.sh
@@ -408,7 +408,7 @@
         - ./tools/deployment/common/cert-manager.sh
         - ./tools/deployment/ceph/ceph-rook.sh
         - ./tools/deployment/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/keystone/keystone.sh
@@ -437,7 +437,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -460,7 +460,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - export VOLUME_HELM_ARGS="--set volume.enabled=false"; ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/db/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
diff --git a/zuul.d/infra_jobs.yaml b/zuul.d/infra_jobs.yaml
index ffb36801b0..da59c8793c 100644
--- a/zuul.d/infra_jobs.yaml
+++ b/zuul.d/infra_jobs.yaml
@@ -27,7 +27,7 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/ceph/ceph-rook.sh
         - ./tools/deployment/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/common/ldap.sh
+        - export NAMESPACE=osh-infra; ./tools/deployment/component/common/ldap.sh
         - ./tools/deployment/logging/elasticsearch.sh
         - ./tools/deployment/logging/fluentd.sh
         - ./tools/deployment/logging/kibana.sh
@@ -46,10 +46,9 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/deploy-docker-registry.sh
-        - ./tools/deployment/common/nfs-provisioner.sh
-        - ./tools/deployment/common/ldap.sh
-        - ./tools/deployment/db/mariadb.sh
-        - ./tools/deployment/db/postgresql.sh
+        - export NAMESPACE=osh-infra; ./tools/deployment/component/common/ldap.sh
+        - export NAMESPACE=osh-infra; ./tools/deployment/db/mariadb.sh
+        - export NAMESPACE=osh-infra; ./tools/deployment/db/postgresql.sh
         - ./tools/deployment/monitoring/prometheus.sh
         - ./tools/deployment/monitoring/alertmanager.sh
         - ./tools/deployment/monitoring/kube-state-metrics.sh
@@ -100,10 +99,10 @@
         - ./tools/deployment/ceph/ceph.sh
         - ./tools/deployment/ceph/ceph-ns-activate.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/rabbitmq.sh
-        - ./tools/deployment/common/memcached.sh
+        - ./tools/deployment/component/common/rabbitmq.sh
+        - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/db/mariadb-operator-cluster.sh
-        - export NAMESPACE=openstack; ./tools/deployment/common/ldap.sh
+        - ./tools/deployment/component/common/ldap.sh
         - |
           export OSH_EXTRA_HELM_ARGS="--set endpoints.oslo_db.hosts.default=mariadb-server-primary ${OSH_EXTRA_HELM_ARGS}"
           ./tools/deployment/openstack/keystone.sh
@@ -161,13 +160,13 @@
         - |
           export NAMESPACE=openstack
           export MONITORING_HELM_ARGS=" "
-          export OSH_EXTRA_HELM_ARGS="--set pod.replicas.server=1 ${OSH_EXTRA_HELM_ARGS}"
           export RUN_HELM_TESTS=no
+          export VOLUME_HELM_ARGS=" "
           ./tools/deployment/db/mariadb.sh
         - |
           export NAMESPACE=openstack
           export VOLUME_HELM_ARGS=" "
-          ./tools/deployment/common/rabbitmq.sh
+          ./tools/deployment/component/common/rabbitmq.sh
         # Migrate legacy Ceph to Rook
         - ./tools/deployment/ceph/migrate-before.sh
         - ./tools/deployment/ceph/migrate-values.sh