diff --git a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
index 48925e64f0e88fcec47eaac017fa33d14094feac..1a95d914a1018182b6afcfb1f4d3d293e91ab0df 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
@@ -107,6 +107,12 @@ else
     IPV6_ENABLED="false"
 fi
 
+# (rocha) we do this as we had v3.2.0 hard-coded and old templates had helm tag badly set to 2.6
+HELM_TAG="v3.2.0"
+if [[ ( $(echo ${CERN_CHART_VERSION} | cut -d. -f2) -ge 13 ) ]]; then
+	HELM_TAG="$HELM_CLIENT_TAG"
+fi
+
 ### Configuration
 ###############################################################################
 CHART_NAME="cern-magnum"
@@ -345,7 +351,7 @@ spec:
       serviceAccountName: tiller
       containers:
       - name: config-helm
-        image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:v3.2.0
+        image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:${HELM_TAG}
         command:
         - bash
         args: