diff --git a/manifests/init.pp b/manifests/init.pp
index 00e02be..5f600a1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -87,6 +87,14 @@
 #   (Optional) Limit the number of memory bytes used by the quorum queue.
 #   Defaults to $facts['os_service_default']
 #
+# [*rabbit_use_queue_manager*]
+#   (Optional) Should we use consistant queue names or random ones.
+#   Defaults to $facts['os_service_default']
+#
+# [*rabbit_stream_fanout*]
+#   (Optional) Use stream queues in RabbitMQ (x-queue-type: stream).
+#   Defaults to $facts['os_service_default']
+#
 # [*rabbit_enable_cancel_on_failover*]
 #   (Optional) Enable x-cancel-on-ha-failover flag so that rabbitmq server will
 #   cancel and notify consumers when queue is down.
@@ -216,6 +224,8 @@ class mistral(
   $rabbit_quorum_delivery_limit       = $facts['os_service_default'],
   $rabbit_quorum_max_memory_length    = $facts['os_service_default'],
   $rabbit_quorum_max_memory_bytes     = $facts['os_service_default'],
+  $rabbit_use_queue_manager           = $facts['os_service_default'],
+  $rabbit_stream_fanout               = $facts['os_service_default'],
   $rabbit_enable_cancel_on_failover   = $facts['os_service_default'],
   $rabbit_use_ssl                     = $facts['os_service_default'],
   $service_down_time                  = $facts['os_service_default'],
@@ -293,6 +303,8 @@ class mistral(
     rabbit_quorum_delivery_limit    => $rabbit_quorum_delivery_limit,
     rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
     rabbit_quorum_max_memory_bytes  => $rabbit_quorum_max_memory_bytes,
+    use_queue_manager               => $rabbit_use_queue_manager,
+    rabbit_stream_fanout            => $rabbit_stream_fanout,
     enable_cancel_on_failover       => $rabbit_enable_cancel_on_failover,
   }
 
diff --git a/releasenotes/notes/queue_manager-and-stream_fanout-e9cc205e808d7e1e.yaml b/releasenotes/notes/queue_manager-and-stream_fanout-e9cc205e808d7e1e.yaml
new file mode 100644
index 0000000..d6a2301
--- /dev/null
+++ b/releasenotes/notes/queue_manager-and-stream_fanout-e9cc205e808d7e1e.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``mistral`` class now has two new parameters
+    ``rabbit_use_queue_manager`` and ``rabbit_stream_fanout``.
diff --git a/spec/classes/mistral_init_spec.rb b/spec/classes/mistral_init_spec.rb
index 2554cd0..b8b0606 100644
--- a/spec/classes/mistral_init_spec.rb
+++ b/spec/classes/mistral_init_spec.rb
@@ -58,6 +58,8 @@ describe 'mistral' do
           :rabbit_quorum_delivery_limit    => '<SERVICE DEFAULT>',
           :rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
           :rabbit_quorum_max_memory_bytes  => '<SERVICE DEFAULT>',
+          :use_queue_manager               => '<SERVICE DEFAULT>',
+          :rabbit_stream_fanout            => '<SERVICE DEFAULT>',
           :enable_cancel_on_failover       => '<SERVICE DEFAULT>',
         )
         is_expected.to contain_mistral_config('openstack_actions/os_actions_endpoint_type').with(