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}