diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 5c34bd6..46f600b 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -8,12 +8,13 @@
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
     manila_cluster_vip_address: ${_param:cluster_vip_address}
+    openstack_rabbitmq_port: 5672
   manila:
     common:
       version: ${_param:openstack_version}
       message_queue:
         engine: rabbitmq
-        port: 5672
+        port: ${_param:openstack_rabbitmq_port}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/manila/common/single.yml b/manila/common/single.yml
index f9d8c6e..e806cde 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -5,12 +5,13 @@
   _param:
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   manila:
     common:
       version: ${_param:openstack_version}
       message_queue:
         engine: rabbitmq
-        port: 5672
+        port: ${_param:openstack_rabbitmq_port}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'