diff --git a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
index ebfec47df..0553e0038 100644
--- a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
+++ b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
@@ -54,10 +54,10 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $host_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
+              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
-              {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
+              {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
               {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
               {{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
 
@@ -93,10 +93,10 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $label_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
+              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
-              {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
+              {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
               {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
               {{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}
 
@@ -191,7 +191,7 @@ limitations under the License.
   {{- $root_conf_copy1 := omit $context.Values.conf "overrides" }}
   {{- $root_conf_copy2 := dict "conf" $root_conf_copy1 }}
   {{- $context_values := omit $context.Values "conf" }}
-  {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
+  {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
   {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
   {{- $_ := set $context.Values.__default "nodeData" $root_conf_copy4 }}
 
@@ -203,7 +203,7 @@ limitations under the License.
   {{- range $current_dict := $context.Values.__daemonset_list }}
 
     {{- $context_novalues := omit $context "Values" }}
-    {{- $merged_dict := merge $current_dict.nodeData $context_novalues }}
+    {{- $merged_dict := mergeOverwrite $context_novalues $current_dict.nodeData }}
     {{- $_ := set $current_dict "nodeData" $merged_dict }}
 
     {{/* name needs to be a DNS-1123 compliant name. Ensure lower case */}}
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
index f36a856a2..743bd6b34 100644
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
@@ -48,10 +48,10 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $host_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
+              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
-              {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
+              {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
               {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
               {{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
 
@@ -87,10 +87,10 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $label_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
+              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
-              {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
+              {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
               {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
               {{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}
 
@@ -185,7 +185,7 @@ limitations under the License.
   {{- $root_conf_copy1 := omit $context.Values.conf "overrides" }}
   {{- $root_conf_copy2 := dict "conf" $root_conf_copy1 }}
   {{- $context_values := omit $context.Values "conf" }}
-  {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
+  {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
   {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
   {{- $_ := set $context.Values.__default "nodeData" $root_conf_copy4 }}
 
@@ -196,7 +196,7 @@ limitations under the License.
   {{- range $current_dict := $context.Values.__daemonset_list }}
 
     {{- $context_novalues := omit $context "Values" }}
-    {{- $merged_dict := merge $current_dict.nodeData $context_novalues }}
+    {{- $merged_dict := mergeOverwrite $context_novalues $current_dict.nodeData }}
     {{- $_ := set $current_dict "nodeData" $merged_dict }}
     {{/* Deep copy original daemonset_yaml */}}
     {{- $_ := set $context.Values "__daemonset_yaml" ($daemonset_yaml | toYaml | fromYaml) }}
diff --git a/playbooks/osh-infra-airship-divingbell-check.yaml b/playbooks/osh-infra-airship-divingbell-check.yaml
index ddffbc45f..e7bdb3b4d 100644
--- a/playbooks/osh-infra-airship-divingbell-check.yaml
+++ b/playbooks/osh-infra-airship-divingbell-check.yaml
@@ -20,5 +20,6 @@
         cd airship-divingbell
         mkdir build
         ln -s ../openstack-helm-infra build/openstack-helm-infra
+        export HELM_ARTIFACT_URL=https://storage.googleapis.com/kubernetes-helm/helm-v2.13.0-linux-amd64.tar.gz
         ./tools/gate/scripts/010-build-charts.sh
         sudo SKIP_BASE_TESTS=true ./tools/gate/scripts/020-test-divingbell.sh
diff --git a/roles/build-helm-packages/defaults/main.yml b/roles/build-helm-packages/defaults/main.yml
index 82523703b..8bed03d36 100644
--- a/roles/build-helm-packages/defaults/main.yml
+++ b/roles/build-helm-packages/defaults/main.yml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 version:
-  helm: v2.12.3
+  helm: v2.13.0
 url:
   google_helm_repo: https://storage.googleapis.com/kubernetes-helm
diff --git a/roles/build-images/defaults/main.yml b/roles/build-images/defaults/main.yml
index a2cc238c0..28f383fbe 100644
--- a/roles/build-images/defaults/main.yml
+++ b/roles/build-images/defaults/main.yml
@@ -14,7 +14,7 @@
 
 version:
   kubernetes: v1.10.9
-  helm: v2.12.3
+  helm: v2.13.0
   cni: v0.6.0
 
 proxy:
diff --git a/tiller/values.yaml b/tiller/values.yaml
index 3277f865a..d17996fd2 100644
--- a/tiller/values.yaml
+++ b/tiller/values.yaml
@@ -26,7 +26,7 @@ release_group: null
 
 images:
   tags:
-    tiller: gcr.io/kubernetes-helm/tiller:v2.12.3
+    tiller: gcr.io/kubernetes-helm/tiller:v2.13.0
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh
index 50509f5c9..df5a3a347 100755
--- a/tools/deployment/common/005-deploy-k8s.sh
+++ b/tools/deployment/common/005-deploy-k8s.sh
@@ -17,7 +17,7 @@
 
 set -xe
 
-: ${HELM_VERSION:="v2.12.3"}
+: ${HELM_VERSION:="v2.13.0"}
 : ${KUBE_VERSION:="v1.12.2"}
 : ${MINIKUBE_VERSION:="v0.30.0"}
 : ${CALICO_VERSION:="v3.3"}
diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile
index 948909ebf..78800b4d5 100644
--- a/tools/images/kubeadm-aio/Dockerfile
+++ b/tools/images/kubeadm-aio/Dockerfile
@@ -43,7 +43,7 @@ ENV CNI_VERSION ${CNI_VERSION}
 ARG CNI_REPO_URL=https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION
 ENV CNI_REPO_URL ${CNI_REPO_URL}
 
-ARG HELM_VERSION="v2.12.3"
+ARG HELM_VERSION="v2.13.0"
 ENV HELM_VERSION ${HELM_VERSION}
 
 ARG CHARTS="calico,flannel,tiller,kube-dns,kubernetes-keystone-webhook"