diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index f52db9dfd1..830b925279 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -23,7 +23,8 @@ make pull-images memcached
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install memcached ./memcached \
     --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_MEMCACHED}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh
index 6518ee80ce..c5037bfbd2 100755
--- a/tools/deployment/developer/ceph/040-ceph.sh
+++ b/tools/deployment/developer/ceph/040-ceph.sh
@@ -157,7 +157,8 @@ EOF
 helm upgrade --install ceph ./ceph \
   --namespace=ceph \
   --values=/tmp/ceph.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph
diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
index 0455c87b97..888f236a06 100755
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -52,7 +52,8 @@ EOF
 helm upgrade --install ceph-openstack-config ./ceph \
   --namespace=openstack \
   --values=/tmp/ceph-openstack-config.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index 07e95a9bbb..b541915786 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -52,7 +52,8 @@ EOF
 helm upgrade --install radosgw-openstack ./ceph \
   --namespace=openstack \
   --values=/tmp/radosgw-openstack.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_RGW}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index fa2e37982b..6ca7822ae3 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -25,7 +25,8 @@ GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --set storage=${GLANCE_BACKEND} \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/130-cinder.sh b/tools/deployment/developer/ceph/130-cinder.sh
index 329c4b3744..8d3053f57a 100755
--- a/tools/deployment/developer/ceph/130-cinder.sh
+++ b/tools/deployment/developer/ceph/130-cinder.sh
@@ -22,7 +22,8 @@ make pull-images cinder
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install cinder ./cinder \
   --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CINDER}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/150-libvirt.sh b/tools/deployment/developer/ceph/150-libvirt.sh
index ba5fa347bc..d2547b58a8 100755
--- a/tools/deployment/developer/ceph/150-libvirt.sh
+++ b/tools/deployment/developer/ceph/150-libvirt.sh
@@ -22,7 +22,8 @@ make pull-images libvirt
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install libvirt ./libvirt \
   --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/160-compute-kit.sh b/tools/deployment/developer/ceph/160-compute-kit.sh
index 8815dc1e05..95cbfcc564 100755
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -25,13 +25,15 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
   helm upgrade --install nova ./nova \
       --namespace=openstack \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --set conf.nova.libvirt.virt_type=qemu \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
 
 #NOTE: Deploy neutron
@@ -65,7 +67,8 @@ EOF
 helm upgrade --install neutron ./neutron \
     --namespace=openstack \
     --values=/tmp/neutron.yaml \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/030-ingress.sh b/tools/deployment/developer/common/030-ingress.sh
index 378485b3a2..04b50003ae 100755
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -31,11 +31,14 @@ EOF
 helm upgrade --install ingress-kube-system ./ingress \
   --namespace=kube-system \
   --values=/tmp/ingress-kube-system.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}
 
 #NOTE: Deploy namespace ingress
 helm upgrade --install ingress-openstack ./ingress \
-  --namespace=openstack
+  --namespace=openstack \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh kube-system
diff --git a/tools/deployment/developer/common/050-mariadb.sh b/tools/deployment/developer/common/050-mariadb.sh
index d6cca99b84..d17175bdb1 100755
--- a/tools/deployment/developer/common/050-mariadb.sh
+++ b/tools/deployment/developer/common/050-mariadb.sh
@@ -24,7 +24,8 @@ make pull-images mariadb
 helm upgrade --install mariadb ./mariadb \
     --namespace=openstack \
     --set pod.replicas.server=1 \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_MARIADB}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh
index 643b02d2ad..1b575c6f42 100755
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -24,7 +24,8 @@ make pull-images rabbitmq
 helm upgrade --install rabbitmq ./rabbitmq \
     --namespace=openstack \
     --set pod.replicas.server=1 \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/080-keystone.sh b/tools/deployment/developer/common/080-keystone.sh
index e1de8d19ee..3d728e2998 100755
--- a/tools/deployment/developer/common/080-keystone.sh
+++ b/tools/deployment/developer/common/080-keystone.sh
@@ -23,7 +23,8 @@ make pull-images keystone
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install keystone ./keystone \
     --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_KEYSTONE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/090-heat.sh b/tools/deployment/developer/common/090-heat.sh
index 8de7bafb32..ee418bf601 100755
--- a/tools/deployment/developer/common/090-heat.sh
+++ b/tools/deployment/developer/common/090-heat.sh
@@ -22,7 +22,8 @@ make pull-images heat
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install heat ./heat \
   --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_HEAT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh
index 241fcdf9ad..03c59215cd 100755
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -25,7 +25,8 @@ helm upgrade --install horizon ./horizon \
     --namespace=openstack \
     --set network.node_port.enabled=true \
     --set network.node_port.port=31000 \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_HORIZON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh
index 64175e50b1..3f862b3ef1 100755
--- a/tools/deployment/developer/common/140-openvswitch.sh
+++ b/tools/deployment/developer/common/140-openvswitch.sh
@@ -22,7 +22,8 @@ make pull-images openvswitch
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install openvswitch ./openvswitch \
   --namespace=openstack \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/nfs/040-nfs-provisioner.sh b/tools/deployment/developer/nfs/040-nfs-provisioner.sh
index 9ab54fd32b..9554240a1a 100755
--- a/tools/deployment/developer/nfs/040-nfs-provisioner.sh
+++ b/tools/deployment/developer/nfs/040-nfs-provisioner.sh
@@ -20,7 +20,8 @@ set -xe
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
     --namespace=nfs \
-    --set storageclass.name=general
+    --set storageclass.name=general \
+    ${OSH_EXTRA_HELM_ARGS_NFS_PROVISIONER}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh nfs
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index 35cb78a0ff..593550282e 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -24,7 +24,8 @@ make pull-images glance
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --set storage=pvc \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh
index f18bbabf8e..bd620e92ca 100755
--- a/tools/deployment/developer/nfs/150-libvirt.sh
+++ b/tools/deployment/developer/nfs/150-libvirt.sh
@@ -23,7 +23,8 @@ make pull-images libvirt
 helm upgrade --install libvirt ./libvirt \
   --namespace=openstack \
   --set ceph.enabled=false \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/nfs/160-compute-kit.sh b/tools/deployment/developer/nfs/160-compute-kit.sh
index e72f775336..3547973e95 100755
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -26,14 +26,16 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --set ceph.enabled=false \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --set ceph.enabled=false \
       --set conf.nova.libvirt.virt_type=qemu \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
 
 #NOTE: Deploy neutron
@@ -65,7 +67,8 @@ EOF
 helm upgrade --install neutron ./neutron \
     --namespace=openstack \
     --values=/tmp/neutron.yaml \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/020-ingress.sh b/tools/deployment/multinode/020-ingress.sh
index 31d73fc0ec..35353dc862 100755
--- a/tools/deployment/multinode/020-ingress.sh
+++ b/tools/deployment/multinode/020-ingress.sh
@@ -29,7 +29,9 @@ network:
 EOF
 helm upgrade --install ingress-kube-system ./ingress \
   --namespace=kube-system \
-  --values=/tmp/ingress-kube-system.yaml
+  --values=/tmp/ingress-kube-system.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}
 
 #NOTE: Deploy namespace ingress
 tee /tmp/ingress-openstack.yaml << EOF
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index 3248e94f3e..417cda55e2 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -74,7 +74,9 @@ conf:
 EOF
 helm upgrade --install ceph ./ceph \
   --namespace=ceph \
-  --values=/tmp/ceph.yaml
+  --values=/tmp/ceph.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph 1200
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index 081f3db3bc..32205b14ca 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -49,7 +49,9 @@ conf:
 EOF
 helm upgrade --install ceph-openstack-config ./ceph \
   --namespace=openstack \
-  --values=/tmp/ceph-openstack-config.yaml
+  --values=/tmp/ceph-openstack-config.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/050-mariadb.sh b/tools/deployment/multinode/050-mariadb.sh
index 5ec34e6d34..ffa966590f 100755
--- a/tools/deployment/multinode/050-mariadb.sh
+++ b/tools/deployment/multinode/050-mariadb.sh
@@ -18,7 +18,9 @@ set -xe
 
 #NOTE: Deploy command
 helm upgrade --install mariadb ./mariadb \
-    --namespace=openstack
+    --namespace=openstack \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_MARIADB}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/060-rabbitmq.sh b/tools/deployment/multinode/060-rabbitmq.sh
index f867247655..c8403b264b 100755
--- a/tools/deployment/multinode/060-rabbitmq.sh
+++ b/tools/deployment/multinode/060-rabbitmq.sh
@@ -18,7 +18,9 @@ set -xe
 
 #NOTE: Deploy command
 helm upgrade --install rabbitmq ./rabbitmq \
-    --namespace=openstack
+    --namespace=openstack \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/080-keystone.sh b/tools/deployment/multinode/080-keystone.sh
index 8e3c12466d..a1177d79f9 100755
--- a/tools/deployment/multinode/080-keystone.sh
+++ b/tools/deployment/multinode/080-keystone.sh
@@ -19,7 +19,9 @@ set -xe
 #NOTE: Deploy command
 helm upgrade --install keystone ./keystone \
     --namespace=openstack \
-    --set pod.replicas.api=2
+    --set pod.replicas.api=2 \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_KEYSTONE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh
index d7af5e2c32..dc7b0fa476 100755
--- a/tools/deployment/multinode/090-ceph-radosgateway.sh
+++ b/tools/deployment/multinode/090-ceph-radosgateway.sh
@@ -49,7 +49,9 @@ conf:
 EOF
 helm upgrade --install radosgw-openstack ./ceph \
   --namespace=openstack \
-  --values=/tmp/radosgw-openstack.yaml
+  --values=/tmp/radosgw-openstack.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_HEAT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh
index f798544b3b..2ab5ec8595 100755
--- a/tools/deployment/multinode/100-glance.sh
+++ b/tools/deployment/multinode/100-glance.sh
@@ -27,7 +27,9 @@ pod:
 EOF
 helm upgrade --install glance ./glance \
   --namespace=openstack \
-  --values=/tmp/glance.yaml
+  --values=/tmp/glance.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/110-cinder.sh b/tools/deployment/multinode/110-cinder.sh
index 437b5a1227..e262cae973 100755
--- a/tools/deployment/multinode/110-cinder.sh
+++ b/tools/deployment/multinode/110-cinder.sh
@@ -30,7 +30,9 @@ conf:
 EOF
 helm upgrade --install cinder ./cinder \
   --namespace=openstack \
-  --values=/tmp/cinder.yaml
+  --values=/tmp/cinder.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CINDER}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/120-openvswitch.sh b/tools/deployment/multinode/120-openvswitch.sh
index 2faa94473c..b903afedef 100755
--- a/tools/deployment/multinode/120-openvswitch.sh
+++ b/tools/deployment/multinode/120-openvswitch.sh
@@ -17,7 +17,9 @@ set -xe
 
 #NOTE: Deploy command
 helm upgrade --install openvswitch ./openvswitch \
-  --namespace=openstack
+  --namespace=openstack \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/130-libvirt.sh b/tools/deployment/multinode/130-libvirt.sh
index 60f3c164e6..ea549bf369 100755
--- a/tools/deployment/multinode/130-libvirt.sh
+++ b/tools/deployment/multinode/130-libvirt.sh
@@ -17,7 +17,9 @@ set -xe
 
 #NOTE: Deploy command
 helm upgrade --install libvirt ./libvirt \
-  --namespace=openstack
+  --namespace=openstack \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh
index fa48c43ec0..a0099bce6f 100755
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -35,13 +35,17 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
   helm upgrade --install nova ./nova \
       --namespace=openstack \
-      --values=/tmp/nova.yaml
+      --values=/tmp/nova.yaml \
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --values=/tmp/nova.yaml \
-      --set conf.nova.libvirt.virt_type=qemu
+      --set conf.nova.libvirt.virt_type=qemu \
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
 
 #NOTE: Deploy neutron
@@ -86,7 +90,9 @@ conf:
 EOF
 helm upgrade --install neutron ./neutron \
     --namespace=openstack \
-    --values=/tmp/neutron.yaml
+    --values=/tmp/neutron.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/150-heat.sh b/tools/deployment/multinode/150-heat.sh
index c4b16c5f94..87d44bebb6 100755
--- a/tools/deployment/multinode/150-heat.sh
+++ b/tools/deployment/multinode/150-heat.sh
@@ -26,7 +26,9 @@ pod:
 EOF
 helm upgrade --install heat ./heat \
   --namespace=openstack \
-  --values=/tmp/heat.yaml
+  --values=/tmp/heat.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_HEAT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/160-barbican.sh b/tools/deployment/multinode/160-barbican.sh
index 5d4d16b519..3cc1d778af 100755
--- a/tools/deployment/multinode/160-barbican.sh
+++ b/tools/deployment/multinode/160-barbican.sh
@@ -18,7 +18,9 @@ set -xe
 #NOTE: Deploy command
 helm upgrade --install barbican ./barbican \
   --namespace=openstack \
-  --set pod.replicas.api=2
+  --set pod.replicas.api=2 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_BARBICAN}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/170-senlin.sh b/tools/deployment/multinode/170-senlin.sh
index fd33d33572..6c6e07cd24 100755
--- a/tools/deployment/multinode/170-senlin.sh
+++ b/tools/deployment/multinode/170-senlin.sh
@@ -19,7 +19,9 @@ set -xe
 helm upgrade --install senlin ./senlin \
   --namespace=openstack \
   --set pod.replicas.api=2 \
-  --set pod.replicas.engine=2
+  --set pod.replicas.engine=2 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_SENLIN}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/180-mistral.sh b/tools/deployment/multinode/180-mistral.sh
index b32a5b2000..3b203d82bd 100755
--- a/tools/deployment/multinode/180-mistral.sh
+++ b/tools/deployment/multinode/180-mistral.sh
@@ -21,7 +21,9 @@ helm upgrade --install mistral ./mistral \
   --set pod.replicas.api=2 \
   --set pod.replicas.engine=2 \
   --set pod.replicas.event_engine=2 \
-  --set pod.replicas.executor=2
+  --set pod.replicas.executor=2 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_MISTRAL}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/190-magnum.sh b/tools/deployment/multinode/190-magnum.sh
index 855d9792f9..2768d43656 100755
--- a/tools/deployment/multinode/190-magnum.sh
+++ b/tools/deployment/multinode/190-magnum.sh
@@ -19,7 +19,9 @@ set -xe
 helm upgrade --install magnum ./magnum \
   --namespace=openstack \
   --set pod.replicas.api=2 \
-  --set pod.replicas.conductor=2
+  --set pod.replicas.conductor=2 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_MAGNUM}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/200-congress.sh b/tools/deployment/multinode/200-congress.sh
index 7c3b354788..9a8d92b3c3 100755
--- a/tools/deployment/multinode/200-congress.sh
+++ b/tools/deployment/multinode/200-congress.sh
@@ -23,7 +23,9 @@ helm upgrade --install congress ./congress \
   --namespace=openstack \
   --set pod.replicas.api=2 \
   --set pod.replicas.policy_engine=2 \
-  --set pod.replicas.datasource=1
+  --set pod.replicas.datasource=1 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CONGRESS}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/210-postgresql.sh b/tools/deployment/multinode/210-postgresql.sh
index 64a8abbe89..8dc703145d 100755
--- a/tools/deployment/multinode/210-postgresql.sh
+++ b/tools/deployment/multinode/210-postgresql.sh
@@ -17,7 +17,9 @@ set -xe
 
 #NOTE: Wait for deploy
 helm upgrade --install postgresql ./postgresql \
-  --namespace=openstack
+  --namespace=openstack \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_POSTGRESQL}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/220-gnocchi.sh b/tools/deployment/multinode/220-gnocchi.sh
index 7381dd35f0..783161774b 100755
--- a/tools/deployment/multinode/220-gnocchi.sh
+++ b/tools/deployment/multinode/220-gnocchi.sh
@@ -18,7 +18,9 @@ set -xe
 #NOTE: Wait for deploy
 helm upgrade --install gnocchi ./gnocchi \
   --namespace=openstack \
-  --set pod.replicas.api=2
+  --set pod.replicas.api=2 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_GNOCCHI}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/230-mongodb.sh b/tools/deployment/multinode/230-mongodb.sh
index 59ca716e0a..d0dafe1dfb 100755
--- a/tools/deployment/multinode/230-mongodb.sh
+++ b/tools/deployment/multinode/230-mongodb.sh
@@ -17,7 +17,9 @@ set -xe
 
 #NOTE: Wait for deploy
 helm upgrade --install mongodb ./mongodb \
-  --namespace=openstack
+  --namespace=openstack \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_MONGODB}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/240-ceilometer.sh b/tools/deployment/multinode/240-ceilometer.sh
index aadf0580c7..50eb3380ca 100755
--- a/tools/deployment/multinode/240-ceilometer.sh
+++ b/tools/deployment/multinode/240-ceilometer.sh
@@ -21,7 +21,9 @@ helm upgrade --install ceilometer ./ceilometer \
   --set pod.replicas.api=2 \
   --set pod.replicas.central=2 \
   --set pod.replicas.collector=2 \
-  --set pod.replicas.notification=2
+  --set pod.replicas.notification=2 \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEILOMETER}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack