diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index c1a8bd6..19bbece 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -23,6 +23,7 @@
     kubernetes_corends_etcd_operator_repo: quay.io/coreos
     kubernetes_containerd_repo: https://github.com/kubernetes-sigs/cri-tools/releases/download
     kubernetes_openstack_provider_repo: ${_param:mcp_binary_registry}/mirantis/kubernetes/cloud-provider-openstack
+    kubernetes_metrics_server_repo: k8s.gcr.io
 
     # component images/binaries
     kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v3.3.2
@@ -69,6 +70,7 @@
     kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.3.2
     kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
     kubernetes_containerd_package: containerd.io=1.2.0-1
+    kubernetes_metrics_server_image: ${_param:kubernetes_metrics_server_repo}/metrics-server-amd64:v0.3.1
 
     kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
     kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:mcp_version}
@@ -92,6 +94,7 @@
     kubernetes_telegraf_enabled: false
     kubernetes_ingressnginx_enabled: false
     kubernetes_containerd_enabled: true
+    kubernetes_metrics_server_enabled: false
 
     kubernetes_ingressnginx_controller_replicas: 1
 
@@ -236,6 +239,9 @@
           enabled: ${_param:kubernetes_ingressnginx_enabled}
           controller_image: ${_param:kubernetes_ingressnginx_controller_image}
           controller_replicas: ${_param:kubernetes_ingressnginx_controller_replicas}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
+          controller_image: ${_param:kubernetes_metrics_server_image}
     pool:
       enabled: false
       kubelet:
diff --git a/kubernetes/control/opencontrail.yml b/kubernetes/control/opencontrail.yml
index 2a46d00..75e3b0d 100644
--- a/kubernetes/control/opencontrail.yml
+++ b/kubernetes/control/opencontrail.yml
@@ -6,6 +6,7 @@
     opencontrail_public_ip_range: 172.17.47.128/25
     opencontrail_public_ip_network: default-domain:default-project:Public
     opencontrail_private_ip_range: 10.150.0.0/16
+    opencontrail_message_queue_password: guest
   kubernetes:
     pool:
       network:
@@ -32,6 +33,7 @@
             auth_password: ${_param:opencontrail_identity_password}
             auth_tenant: ${_param:opencontrail_identity_tenant}
           message_queue:
+            password: ${_param:opencontrail_message_queue_password}
             host: ${_param:single_address}
           database:
             members:
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index ed6fb15..8889a8b 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -16,6 +16,7 @@
     opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
     opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
     opencontrail_message_queue_address: ${_param:openstack_message_queue_address}
+    opencontrail_message_queue_password: guest
     opencontrail_analytics_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analytics:${_param:opencontrail_image_tag}
     opencontrail_analyticsdb_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analyticsdb:${_param:opencontrail_image_tag}
     opencontrail_analytics_container_name: opencontrail_analytics_1
@@ -53,6 +54,7 @@
         - host: ${_param:opencontrail_analytics_node03_address}
       message_queue:
         host: ${_param:opencontrail_message_queue_address}
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 5914c50..1409a65 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -16,6 +16,7 @@
     opencontrail_message_queue_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_message_queue_node03_address: ${_param:openstack_control_node03_address}
     opencontrail_message_queue_address: ${_param:openstack_control_address}
+    opencontrail_message_queue_password: guest
     opencontrail_analytics_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analytics:${_param:opencontrail_image_tag}
     opencontrail_analyticsdb_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analyticsdb:${_param:opencontrail_image_tag}
     opencontrail_controller_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller:${_param:opencontrail_image_tag}
@@ -54,6 +55,7 @@
         - host: ${_param:cluster_node03_address}
       message_queue:
         host: ${_param:opencontrail_message_queue_address}
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
@@ -89,6 +91,7 @@
         - host: ${_param:cluster_node02_address}
         - host: ${_param:cluster_node03_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
@@ -106,6 +109,7 @@
         - host: ${_param:cluster_node02_address}
         - host: ${_param:cluster_node03_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
diff --git a/opencontrail/control/cluster4_0_k8s.yml b/opencontrail/control/cluster4_0_k8s.yml
index 5564ccf..03ad89c 100644
--- a/opencontrail/control/cluster4_0_k8s.yml
+++ b/opencontrail/control/cluster4_0_k8s.yml
@@ -14,6 +14,7 @@
     opencontrail_message_queue_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_message_queue_node03_address: ${_param:openstack_control_node03_address}
     opencontrail_message_queue_address: ${_param:openstack_control_address}
+    opencontrail_message_queue_password: guest
     opencontrail_analytics_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analytics:${_param:opencontrail_image_tag}
     opencontrail_analyticsdb_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analyticsdb:${_param:opencontrail_image_tag}
     opencontrail_controller_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller:${_param:opencontrail_image_tag}
@@ -52,6 +53,7 @@
         - host: ${_param:cluster_node03_address}
       message_queue:
         host: ${_param:opencontrail_message_queue_address}
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
@@ -87,6 +89,7 @@
         - host: ${_param:cluster_node02_address}
         - host: ${_param:cluster_node03_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
@@ -104,6 +107,7 @@
         - host: ${_param:cluster_node02_address}
         - host: ${_param:cluster_node03_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index acf5530..716088c 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -11,6 +11,7 @@
     opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
     opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
     opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
+    opencontrail_message_queue_password: guest
     opencontrail_controller_image: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller:${_param:opencontrail_image_tag}
     opencontrail_controller_container_name: opencontrail_controller_1
     opencontrail_api_workers_count: 6
@@ -39,6 +40,7 @@
         - host: ${_param:opencontrail_analytics_node02_address}
         - host: ${_param:opencontrail_analytics_node03_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
@@ -55,6 +57,7 @@
         - host: ${_param:opencontrail_analytics_node02_address}
         - host: ${_param:opencontrail_analytics_node03_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:opencontrail_message_queue_node01_address}
         - host: ${_param:opencontrail_message_queue_node02_address}
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 9857221..726fa8f 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -16,6 +16,7 @@
     opencontrail_controller_container_name: opencontrail_controller_1
     opencontrail_analytics_container_name: opencontrail_analytics_1
     opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
+    opencontrail_message_queue_password: guest
 # Temprorary fix for MOS9 packages to pin old version of kafka
   linux:
     system:
@@ -94,6 +95,7 @@
         members:
         - host: ${_param:single_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:openstack_control_address}
       identity:
@@ -105,6 +107,7 @@
         members:
         - host: ${_param:single_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:openstack_control_address}
       database:
@@ -143,6 +146,7 @@
         - host: ${_param:single_address}
       message_queue:
         host: ${_param:openstack_control_address}
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:openstack_control_address}
       config: