diff --git a/heat/values.yaml b/heat/values.yaml
index f005f63d..84e9ebe1 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -469,6 +469,8 @@ conf:
       driver: messagingv2
     oslo_middleware:
       enable_proxy_headers_parsing: true
+    oslo_messaging_rabbit:
+      rabbit_ha_queues: True
   logging:
     loggers:
       keys: