diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index f0cf352..8271c7f 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -15,6 +15,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
@@ -52,6 +53,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 381a0d2..fbf345b 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -15,6 +15,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}
@@ -53,6 +54,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}
@@ -88,6 +90,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}
@@ -105,6 +108,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 cb9ce4f..25ce7bd 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 779d8d0..2fefc09 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -15,6 +15,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:
@@ -93,6 +94,7 @@
         members:
         - host: ${_param:single_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:openstack_control_address}
       identity:
@@ -104,6 +106,7 @@
         members:
         - host: ${_param:single_address}
       message_queue:
+        password: ${_param:opencontrail_message_queue_password}
         members:
         - host: ${_param:openstack_control_address}
       database:
@@ -142,6 +145,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: