diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 89a5885..54f0058 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -69,6 +69,8 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 4ce11fa..095e09b 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -32,6 +32,8 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}