diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index aac0400..dd4804f 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -7,6 +7,7 @@
     cluster_internal_protocol: 'http'
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   barbican:
     server:
       role: ${_param:openstack_node_role}
@@ -21,6 +22,8 @@
           cert_file: ${_param:mysql_barbican_client_ssl_cert_file}
         ssl:
           enabled: ${_param:galera_ssl_enabled}
+      message_queue:
+        port: ${_param:openstack_rabbitmq_port}
   linux:
     system:
       package:
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index 6bed260..21054e3 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -6,6 +6,7 @@
     internal_protocol: 'http'
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   barbican:
     server:
       database:
@@ -19,6 +20,8 @@
       role: ${_param:openstack_node_role}
       identity:
         protocol: ${_param:internal_protocol}
+      message_queue:
+        port: ${_param:openstack_rabbitmq_port}
   linux:
     system:
       package: