diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 73c679b..27f2641 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -15,6 +15,7 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
         host: ${_param:openstack_message_queue_address}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index fe59263..61930a7 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -13,7 +13,8 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-        host: ${_param:single_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_manila_ssl_ca_file}