diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 53ec417..d4dc529 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -60,6 +60,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/aodh/server/single.yml b/aodh/server/single.yml
index 3f2ea75..a86aabe 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -25,6 +25,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}
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 558f08b..a40ed99 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -23,6 +23,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}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index 1ee95f7..3e9a10a 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -24,6 +24,8 @@
         password: ${_param:keystone_barbican_password}
         protocol: ${_param:internal_protocol}
       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}
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index c24adf7..f909934 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -22,6 +22,8 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
         members:
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 0bf079f..addca8c 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -13,6 +13,8 @@
         password: ${_param:keystone_ceilometer_password}
         protocol: ${_param:internal_protocol}
       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}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 8f9c996..d5eeab7 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -24,6 +24,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
+        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/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 36f2f08..61ceca9 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -9,6 +9,8 @@
         ssl:
           enabled: ${_param:ceilometer_agent_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}
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 485eda2..47233c0 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -36,6 +36,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
+        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/ceilometer/server/single.yml b/ceilometer/server/single.yml
index eeadcc0..9ab0316 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -18,6 +18,8 @@
           host: ${_param:stacklight_monitor_address}
           port: 9200
       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}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index 9ee78ef..07bcdf6 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -30,6 +30,8 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
         members:
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 1724277..8b0cc0e 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -7,6 +7,8 @@
     server:
       role: ${_param:openstack_node_role}
       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}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index c8c25bd..23787a7 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -65,6 +65,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
+        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/cinder/control/single.yml b/cinder/control/single.yml
index 963e308..6760d05 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -42,6 +42,8 @@
       barbican:
         enabled: ${_param:barbican_integration_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}
diff --git a/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
index 6b41224..14a9a4a 100644
--- a/cinder/volume/backend/ceph.yml
+++ b/cinder/volume/backend/ceph.yml
@@ -4,6 +4,8 @@
   cinder:
     volume:
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         ha_queues: true
       enabled: true
       notification: true
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index c35129d..e0c6ed8 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -24,8 +24,9 @@
       barbican:
         enabled: ${_param:barbican_integration_enabled}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
-        host: ${_param:single_address}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_cinder_ssl_ca_file}
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index c40c7e9..695d27f 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -32,6 +32,8 @@
         enabled: ${_param:barbican_integration_enabled}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        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/defaults/rabbitmq/init.yml b/defaults/rabbitmq/init.yml
index 2cad9ec..ca9ee5f 100644
--- a/defaults/rabbitmq/init.yml
+++ b/defaults/rabbitmq/init.yml
@@ -2,3 +2,4 @@
   _param:
     # SSL
     rabbitmq_ssl_enabled: False
+    openstack_rabbitmq_standalone_mode: False
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 9656bc9..2b1cbf6 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -58,6 +58,8 @@
         api:
           address: ${_param:single_address}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         engine: rabbitmq
         port: ${_param:openstack_rabbitmq_port}
         members:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 55998d5..e160aa4 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -54,6 +54,8 @@
         api:
           address: ${_param:single_address}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         engine: rabbitmq
         port: ${_param:openstack_rabbitmq_port}
         members:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index 8f07ffb..792294f 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -53,7 +53,8 @@
         protocol: ${_param:internal_protocol}
       message_queue:
         engine: rabbitmq
-        host: ${_param:cluster_vip_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 0eae619..d8fc376 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -65,6 +65,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/glance/control/single.yml b/glance/control/single.yml
index 160d26d..179eec7 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -36,6 +36,8 @@
       barbican:
         enabled: ${_param:barbican_integration_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}
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}
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index cd6c667..c3c5a26 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -26,6 +26,8 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
+        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/ironic/api/single.yml b/ironic/api/single.yml
index db39076..22f57fd 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -24,6 +24,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}
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 69cc3dc..6709403 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -24,6 +24,8 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
+        host: ${_param:openstack_message_queue_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 88179a3..a55c8c3 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -23,6 +23,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}
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index e0d01d9..16ec57a 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -67,6 +67,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
+        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/keystone/server/single.yml b/keystone/server/single.yml
index 8c5e594..080c65e 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -62,7 +62,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
-        host: ${_param:single_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
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}
diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
index 73dcb38..5001c64 100644
--- a/murano/server/cluster.yml
+++ b/murano/server/cluster.yml
@@ -29,6 +29,8 @@
         user: ${_param:keystone_murano_username}
         password: ${_param:keystone_murano_password}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         engine: rabbitmq
         port: 5672
         members:
diff --git a/murano/server/single.yml b/murano/server/single.yml
index 1512893..0f3c1ed 100644
--- a/murano/server/single.yml
+++ b/murano/server/single.yml
@@ -29,7 +29,8 @@
       message_queue:
         engine: rabbitmq
         port: 5672
-        host: ${_param:cluster_vip_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 0766df7..32a8efc 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -31,6 +31,8 @@
         tenant_network_types: ${_param:neutron_tenant_network_types}"
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        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/neutron/control/cluster.yml b/neutron/control/cluster.yml
index fe6f464..c95db09 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -20,6 +20,8 @@
         password: ${_param:keystone_nova_password}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        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/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 00fa23c..ce55faa 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -10,6 +10,8 @@
         region: ${_param:openstack_region}
         host: ${_param:openstack_control_address}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:single_address}
       compute:
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 5beb0ca..bbf629c 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -39,5 +39,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:single_address}
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index 73702fd..3a73f05 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -37,6 +37,8 @@
         password: ${_param:keystone_neutron_password}
         region: ${_param:openstack_region}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
       ovn_ctl_opts:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index bc025eb..76f3654 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -26,6 +26,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}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 58aaab8..517c955 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -22,6 +22,8 @@
         tenant_network_types: "${_param:neutron_tenant_network_types}"
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        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/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 3154a37..287987e 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -54,6 +54,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/nova/compute/single.yml b/nova/compute/single.yml
index a6126ef..519ff37 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -49,7 +49,8 @@
         enabled: ${_param:nova_service_user_enabled}
       message_queue:
         engine: rabbitmq
-        host: ${_param:control_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index 8b57948..7943453 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -28,6 +28,8 @@
       service_user:
         enabled: ${_param:nova_service_user_enabled}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         engine: rabbitmq
         port: 5672
         user: openstack
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index bc3ee7c..ab99139 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -33,7 +33,8 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-        host: ${_param:control_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
       network:
         engine: neutron
         region: ${_param:openstack_region}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 7541d28..87363d3 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -73,6 +73,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/nova/control/single.yml b/nova/control/single.yml
index e964f76..10f9a1c 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -37,6 +37,8 @@
       barbican:
         enabled: ${_param:barbican_integration_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}
diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index e698481..1332c60 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -25,6 +25,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
         host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         x509:
diff --git a/octavia/api/single.yml b/octavia/api/single.yml
index b359885..f76560c 100644
--- a/octavia/api/single.yml
+++ b/octavia/api/single.yml
@@ -24,6 +24,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
         host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         x509:
diff --git a/octavia/manager/cluster.yml b/octavia/manager/cluster.yml
index c10e800..cfee518 100644
--- a/octavia/manager/cluster.yml
+++ b/octavia/manager/cluster.yml
@@ -26,6 +26,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
         host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         x509:
diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index 51671eb..fadae05 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -31,6 +31,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
         host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         x509:
diff --git a/sahara/server/cluster.yml b/sahara/server/cluster.yml
index 3e48e7d..00c5e3e 100644
--- a/sahara/server/cluster.yml
+++ b/sahara/server/cluster.yml
@@ -29,6 +29,8 @@
         user: ${_param:keystone_sahara_username}
         password: ${_param:keystone_sahara_password}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         engine: rabbitmq
         port: 5672
         members:
diff --git a/sahara/server/single.yml b/sahara/server/single.yml
index 3b63c44..625849d 100644
--- a/sahara/server/single.yml
+++ b/sahara/server/single.yml
@@ -25,7 +25,8 @@
         tenant: service
       message_queue:
         engine: rabbitmq
-        host: ${_param:cluster_vip_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: 5672
         user: openstack
         password: ${_param:rabbitmq_openstack_password}