diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh
index d2d6eb515c4662b53a7f8c770e57d8ff1173a470..ed620b3c4b5092c955ce193736c7a112e7f5413c 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh
@@ -42,6 +42,7 @@ CLUSTER_SUBNET="$CLUSTER_SUBNET"
 TLS_DISABLED="$TLS_DISABLED"
 KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"
 INFLUX_GRAFANA_DASHBOARD_ENABLED="$INFLUX_GRAFANA_DASHBOARD_ENABLED"
+GRAFANA_ADMIN_PASSWD="$GRAFANA_ADMIN_PASSWD"
 VERIFY_CA="$VERIFY_CA"
 CLUSTER_UUID="$CLUSTER_UUID"
 MAGNUM_URL="$MAGNUM_URL"
diff --git a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
index 4be926b7d3d5e6d8f40dfec2a35cdd6b0ca96335..194864ab7629070a7b7f8b71107a67f2f62f0a88 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
@@ -125,6 +125,22 @@ ${NVIDIA_GPU_VALUES}
         role: ${INGRESS_CONTROLLER_ROLE}
     metrics-server:
       enabled: ${METRICS_SERVER_ENABLED}
+    kube-prometheus-stack:
+      enabled: ${MONITORING_ENABLED}
+      grafana:
+        adminPassword: ${GRAFANA_ADMIN_PASSWD}
+      prometheus:
+        prometheusSpec:
+          externalLabels:
+            cluster_uuid: ${CLUSTER_UUID}
+          resources:
+            requests:
+              cpu: $(expr 128 + 7 \* ${MAX_NODE_COUNT} )m
+              memory: $(expr 256 + 40 \* ${MAX_NODE_COUNT})M
+    prometheus-adapter:
+      enabled: ${PROMETHEUS_ADAPTER_ENABLED}
+      rules:
+        existing: ${PROMETHEUS_ADAPTER_CONFIGMAP}
 EOF
 fi
 
diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
index ef5c03de259fc98c8dc6acf6693b55acf54d6711..469d87d13b6d4522801eac73a20e33a141181241 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
@@ -12,7 +12,8 @@ CHART_NAME="prometheus-adapter"
 
 
 if [ "$(echo ${MONITORING_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ] && \
-   [ "$(echo ${PROMETHEUS_ADAPTER_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ]; then
+   [ "$(echo ${PROMETHEUS_ADAPTER_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ] && \
+   [[ ( $(echo ${CERN_CHART_VERSION} | cut -d. -f2) -lt 10 ) ]]; then
 
     HELM_MODULE_CONFIG_FILE="/srv/magnum/kubernetes/helm/${CHART_NAME}.yaml"
     [ -f ${HELM_MODULE_CONFIG_FILE} ] || {
diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
index 6d0c69ccdd59aa33302aa1c80d5bfc7df961fd25..3dc333228152066566e3fc6a3bbdd86fa5669990 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
@@ -10,7 +10,8 @@ printf "Starting to run ${step}\n"
 ###############################################################################
 CHART_NAME="prometheus-operator"
 
-if [ "$(echo ${MONITORING_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ]; then
+if [ "$(echo ${MONITORING_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ] && \
+   [[ ( $(echo ${CERN_CHART_VERSION} | cut -d. -f2) -lt 10 ) ]]; then
 
     # Calculate resources needed to run the Prometheus Monitoring Solution
     # MAX_NODE_COUNT so we can have metrics even if cluster scales
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
index 4667dc576904a6bf9a265584bfa87247555abb54..70403f84b163c547b200e600798211ea3fbbba4b 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
@@ -960,6 +960,7 @@ resources:
                   "$TRAEFIK_INGRESS_CONTROLLER_TAG": {get_param: traefik_ingress_controller_tag}
                   "$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
                   "$INFLUX_GRAFANA_DASHBOARD_ENABLED": {get_param: influx_grafana_dashboard_enabled}
+                  "$GRAFANA_ADMIN_PASSWD": {get_param: grafana_admin_passwd}
                   "$VERIFY_CA": {get_param: verify_ca}
                   "$CLUSTER_UUID": {get_param: cluster_uuid}
                   "$MAGNUM_URL": {get_param: magnum_url}