diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index 68f627aec2..ebd6bb4d21 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -17,9 +17,8 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./memcached \
-    --namespace=openstack \
-    --name=memcached
+helm upgrade --install memcached ./memcached \
+    --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 4b2368f105..0437b4d802 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -19,7 +19,8 @@ set -xe
 sudo -H -E pip install python-openstackclient python-heatclient
 
 sudo -H mkdir -p /etc/openstack
-cat << EOF | sudo -H tee -a /etc/openstack/clouds.yaml
+sudo -H chown -R $(id -un): /etc/openstack
+tee /etc/openstack/clouds.yaml << EOF
 clouds:
   openstack_helm:
     region_name: RegionOne
@@ -32,7 +33,6 @@ clouds:
       user_domain_name: 'default'
       auth_url: 'http://keystone.openstack.svc.cluster.local/v3'
 EOF
-sudo -H chown -R $(id -un): /etc/openstack
 
 #NOTE: Build charts
 make all
diff --git a/tools/deployment/multinode/020-ingress.sh b/tools/deployment/multinode/020-ingress.sh
index 3058f6e1bf..31d73fc0ec 100755
--- a/tools/deployment/multinode/020-ingress.sh
+++ b/tools/deployment/multinode/020-ingress.sh
@@ -17,21 +17,30 @@
 set -xe
 
 #NOTE: Deploy global ingress
-helm install ./ingress \
+tee /tmp/ingress-kube-system.yaml << EOF
+pod:
+  replicas:
+    error_page: 2
+deployment:
+  mode: cluster
+  type: DaemonSet
+network:
+  host_namespace: true
+EOF
+helm upgrade --install ingress-kube-system ./ingress \
   --namespace=kube-system \
-  --name=ingress-kube-system \
-  --set pod.replicas.error_page=2 \
-  --set deployment.mode=cluster \
-  --set deployment.type=DaemonSet \
-  --set network.host_namespace=true \
-  --set conf.services.udp.53='kube-system/kube-dns:53'
+  --values=/tmp/ingress-kube-system.yaml
 
 #NOTE: Deploy namespace ingress
-helm install ./ingress \
+tee /tmp/ingress-openstack.yaml << EOF
+pod:
+  replicas:
+    ingress: 2
+    error_page: 2
+EOF
+helm upgrade --install ingress-openstack ./ingress \
   --namespace=openstack \
-  --name=ingress-openstack \
-  --set pod.replicas.ingress=2 \
-  --set pod.replicas.error_page=2
+  --values=/tmp/ingress-openstack.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh kube-system
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index dfe2288340..3b6cd09d9b 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -18,9 +18,10 @@ set -xe
 
 #NOTE: Deploy command
 uuidgen > /tmp/ceph-fs-uuid.txt
-CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-cat > /tmp/ceph.yaml <<EOF
+CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_CLUSTER_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
+tee /tmp/ceph.yaml << EOF
 endpoints:
   identity:
     namespace: openstack
@@ -43,13 +44,12 @@ bootstrap:
 conf:
   config:
     global:
-      fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
+      fsid: ${CEPH_FS_ID}
   rgw_ks:
     enabled: true
 EOF
-helm install ./ceph \
+helm upgrade --install ceph ./ceph \
   --namespace=ceph \
-  --name=ceph \
   --values=/tmp/ceph.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index 87b27a996f..ce547f29ab 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -17,9 +17,10 @@
 set -xe
 
 #NOTE: Deploy command
-CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-cat > /tmp/ceph-openstack-config.yaml <<EOF
+CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_CLUSTER_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
+tee /tmp/ceph-openstack-config.yaml <<EOF
 endpoints:
   identity:
     namespace: openstack
@@ -42,17 +43,16 @@ bootstrap:
 conf:
   config:
     global:
-      fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
+      fsid: ${CEPH_FS_ID}
   rgw_ks:
     enabled: true
 EOF
-helm install ./ceph \
+helm upgrade --install ceph-openstack-config ./ceph \
   --namespace=openstack \
-  --name=ceph-openstack-config \
   --values=/tmp/ceph-openstack-config.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status ceph
+helm status ceph-openstack-config
diff --git a/tools/deployment/multinode/050-mariadb.sh b/tools/deployment/multinode/050-mariadb.sh
index 0b99516311..5ec34e6d34 100755
--- a/tools/deployment/multinode/050-mariadb.sh
+++ b/tools/deployment/multinode/050-mariadb.sh
@@ -17,10 +17,8 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./mariadb \
-    --namespace=openstack \
-    --name=mariadb \
-    --set volume.enabled=false
+helm upgrade --install mariadb ./mariadb \
+    --namespace=openstack
 
 #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 e621127c29..f867247655 100755
--- a/tools/deployment/multinode/060-rabbitmq.sh
+++ b/tools/deployment/multinode/060-rabbitmq.sh
@@ -17,9 +17,8 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./rabbitmq \
-    --namespace=openstack \
-    --name=rabbitmq
+helm upgrade --install rabbitmq ./rabbitmq \
+    --namespace=openstack
 
 #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 49f42fbaef..8e3c12466d 100755
--- a/tools/deployment/multinode/080-keystone.sh
+++ b/tools/deployment/multinode/080-keystone.sh
@@ -17,9 +17,8 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./keystone \
+helm upgrade --install keystone ./keystone \
     --namespace=openstack \
-    --name=keystone \
     --set pod.replicas.api=2
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh
index 86dc6bd7c2..14e59958ba 100755
--- a/tools/deployment/multinode/090-ceph-radosgateway.sh
+++ b/tools/deployment/multinode/090-ceph-radosgateway.sh
@@ -17,9 +17,10 @@
 set -xe
 
 #NOTE: Deploy command
-CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-cat > /tmp/radosgw-openstack.yaml <<EOF
+CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_CLUSTER_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
+tee /tmp/radosgw-openstack.yaml <<EOF
 endpoints:
   identity:
     namespace: openstack
@@ -42,13 +43,12 @@ bootstrap:
 conf:
   config:
     global:
-      fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
+      fsid: ${CEPH_FS_ID}
   rgw_ks:
     enabled: true
 EOF
-helm install ./ceph \
+helm upgrade --install radosgw-openstack ./ceph \
   --namespace=openstack \
-  --name=radosgw-openstack \
   --values=/tmp/radosgw-openstack.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh
index f5fa5bb756..f798544b3b 100755
--- a/tools/deployment/multinode/100-glance.sh
+++ b/tools/deployment/multinode/100-glance.sh
@@ -18,12 +18,16 @@ set -xe
 
 #NOTE: Deploy command
 GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
-helm install ./glance \
+tee /tmp/glance.yaml << EOF
+storage: ${GLANCE_BACKEND}
+pod:
+  replicas:
+    api: 2
+    registry: 2
+EOF
+helm upgrade --install glance ./glance \
   --namespace=openstack \
-  --name=glance \
-  --set pod.replicas.api=2 \
-  --set pod.replicas.registry=2 \
-  --set storage=${GLANCE_BACKEND}
+  --values=/tmp/glance.yaml
 
 #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 42e4ef29e4..437b5a1227 100755
--- a/tools/deployment/multinode/110-cinder.sh
+++ b/tools/deployment/multinode/110-cinder.sh
@@ -16,14 +16,21 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./cinder \
+tee /tmp/cinder.yaml << EOF
+pod:
+  replicas:
+    api: 2
+    volume: 1
+    scheduler: 1
+    backup: 1
+conf:
+  cinder:
+    DEFAULT:
+      backup_driver: cinder.backup.drivers.swift
+EOF
+helm upgrade --install cinder ./cinder \
   --namespace=openstack \
-  --name=cinder \
-  --set pod.replicas.api=2 \
-  --set pod.replicas.volume=1 \
-  --set pod.replicas.scheduler=1 \
-  --set pod.replicas.backup=1 \
-  --set conf.cinder.DEFAULT.backup_driver=cinder.backup.drivers.swift
+  --values=/tmp/cinder.yaml
 
 #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 654641c747..2faa94473c 100755
--- a/tools/deployment/multinode/120-openvswitch.sh
+++ b/tools/deployment/multinode/120-openvswitch.sh
@@ -16,9 +16,8 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./openvswitch \
-  --namespace=openstack \
-  --name=openvswitch
+helm upgrade --install openvswitch ./openvswitch \
+  --namespace=openstack
 
 #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 ecbfa7fa01..60f3c164e6 100755
--- a/tools/deployment/multinode/130-libvirt.sh
+++ b/tools/deployment/multinode/130-libvirt.sh
@@ -16,9 +16,8 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./libvirt \
-  --namespace=openstack \
-  --name=libvirt
+helm upgrade --install libvirt ./libvirt \
+  --namespace=openstack
 
 #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 59ceb0b4da..fa48c43ec0 100755
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -16,34 +16,31 @@
 set -xe
 
 #NOTE: Deploy nova
+tee /tmp/nova.yaml << EOF
+labels:
+  api_metadata:
+    node_selector_key: openstack-helm-node-class
+    node_selector_value: primary
+pod:
+  replicas:
+    api_metadata: 1
+    placement: 2
+    osapi: 2
+    conductor: 2
+    consoleauth: 2
+    scheduler: 1
+    novncproxy: 1
+EOF
 if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
-  helm install ./nova \
+  helm upgrade --install nova ./nova \
       --namespace=openstack \
-      --name=nova \
-      --set pod.replicas.api_metadata=1 \
-      --set pod.replicas.placement=2 \
-      --set pod.replicas.osapi=2 \
-      --set pod.replicas.conductor=2 \
-      --set pod.replicas.consoleauth=2 \
-      --set pod.replicas.scheduler=2 \
-      --set pod.replicas.novncproxy=1 \
-      --set labels.api_metadata.node_selector_key=openstack-helm-node-class \
-      --set labels.api_metadata.node_selector_value=primary
+      --values=/tmp/nova.yaml
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
-  helm install ./nova \
+  helm upgrade --install nova ./nova \
       --namespace=openstack \
-      --name=nova \
-      --set pod.replicas.api_metadata=1 \
-      --set pod.replicas.placement=2 \
-      --set pod.replicas.osapi=2 \
-      --set pod.replicas.conductor=2 \
-      --set pod.replicas.consoleauth=2 \
-      --set pod.replicas.scheduler=2 \
-      --set pod.replicas.novncproxy=1 \
-      --set labels.api_metadata.node_selector_key=openstack-helm-node-class \
-      --set labels.api_metadata.node_selector_value=primary \
+      --values=/tmp/nova.yaml \
       --set conf.nova.libvirt.virt_type=qemu
 fi
 
@@ -87,9 +84,8 @@ conf:
       ovs:
         bridge_mappings: public:br-ex
 EOF
-helm install ./neutron \
+helm upgrade --install neutron ./neutron \
     --namespace=openstack \
-    --name=neutron \
     --values=/tmp/neutron.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/multinode/150-heat.sh b/tools/deployment/multinode/150-heat.sh
index 4ed5c27b97..c4b16c5f94 100755
--- a/tools/deployment/multinode/150-heat.sh
+++ b/tools/deployment/multinode/150-heat.sh
@@ -16,13 +16,17 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./heat \
+tee /tmp/heat.yaml << EOF
+pod:
+  replicas:
+    api: 2
+    cfn: 2
+    cloudwatch: 2
+    engine: 2
+EOF
+helm upgrade --install heat ./heat \
   --namespace=openstack \
-  --name=heat \
-  --set pod.replicas.api=2 \
-  --set pod.replicas.cfn=2 \
-  --set pod.replicas.cloudwatch=2 \
-  --set pod.replicas.engine=2
+  --values=/tmp/heat.yaml
 
 #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 8355a09a39..5d4d16b519 100755
--- a/tools/deployment/multinode/160-barbican.sh
+++ b/tools/deployment/multinode/160-barbican.sh
@@ -16,10 +16,9 @@
 set -xe
 
 #NOTE: Deploy command
-helm install ./barbican \
+helm upgrade --install barbican ./barbican \
   --namespace=openstack \
-  --name=barbican \
-  --set pod.replicas.api=1
+  --set pod.replicas.api=2
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack