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}