diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 6e95a6e..f667e7f 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -58,6 +58,8 @@
           - ${_param:kubernetes_metallb_addresses_pool}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index 42f5e32..e6b9c57 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -85,6 +85,7 @@
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_metrics_server_enabled: false
 
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 1e2f60f..218f874 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -57,6 +57,8 @@
           - ${_param:kubernetes_metallb_addresses_pool}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 8181eaf..51345be 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -83,6 +83,7 @@
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_metrics_server_enabled: false
 
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 3d55a35..b79c347 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -82,6 +82,8 @@
           provider: ${_param:kubernetes_externaldns_provider}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
     master:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index 1ea0664..6248da2 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -48,6 +48,7 @@
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_metrics_server_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index a316fb8..0e9759d 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -59,6 +59,8 @@
           - ${_param:kubernetes_metallb_addresses_pool}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index da507c0..ed04ef3 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -47,6 +47,7 @@
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_metrics_server_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
index 5c131c7..9cafe3e 100644
--- a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
@@ -54,6 +54,8 @@
           provider: ${_param:kubernetes_externaldns_provider}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
index cc1253b..800b18a 100644
--- a/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
@@ -52,6 +52,7 @@
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_metrics_server_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
index 7de9af4..cf233b2 100644
--- a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
@@ -38,6 +38,8 @@
           provider: ${_param:kubernetes_externaldns_provider}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       etcd:
         ssl:
diff --git a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
index ba2f148..38e2135 100644
--- a/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
@@ -28,6 +28,7 @@
     kubernetes_externaldns_enabled: false
     kubernetes_ingressnginx_enabled: false
     kubernetes_virtlet_enabled: true
+    kubernetes_metrics_server_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 1c201ee..8114764 100644
--- a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -62,6 +62,8 @@
           - ${_param:kubernetes_metallb_addresses_pool}
         ingress-nginx:
           enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml
index f5b45d0..2bd1cd5 100644
--- a/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster_deprecated/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -92,6 +92,7 @@
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_metrics_server_enabled: false
 
   linux:
     network: