diff --git a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
index 025c96595cf5adc4e7964a8ce5d6ecacc9ab4b08..da88d4e4f3ed2cb51aa6857eb76faa3604c671d9 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
@@ -60,11 +60,6 @@ data:
     mkdir -p \${HELM_HOME}
     cp /etc/helm/* \${HELM_HOME}
 
-    # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
-    until helm init --stable-repo-url=https://charts.helm.sh/stable --client-only --wait
-    do
-        sleep 5s
-    done
     helm repo add releases https://registry.cern.ch/chartrepo/releases
     helm repo update
 
@@ -72,7 +67,7 @@ data:
         echo "${CHART_NAME} already installed on server. Continue..."
         exit 0
     else
-        helm install releases/${CHART_NAME} --wait --namespace kube-system --name ${CHART_NAME} --version ${CERN_CHART_VERSION} --values /opt/magnum/install-${CHART_NAME}-values.yaml
+        helm -n kube-system install ${CHART_NAME} releases/${CHART_NAME} --wait --version ${CERN_CHART_VERSION} --values /opt/magnum/install-${CHART_NAME}-values.yaml
     fi
 
   install-${CHART_NAME}-values.yaml:  |
@@ -115,7 +110,7 @@ spec:
       serviceAccountName: tiller
       containers:
       - name: config-helm
-        image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:${HELM_CLIENT_TAG}
+        image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:v3.2.0
         command:
         - bash
         args: