diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 662d864176..2c4f48aa24 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -275,18 +275,7 @@ om_enable_rabbitmq_tls: "{{ rabbitmq_enable_tls | bool }}"
 om_rabbitmq_cacert: "{{ rabbitmq_cacert }}"
 om_rabbitmq_qos_prefetch_count: "1"
 
-om_enable_rabbitmq_quorum_queues: true
-om_enable_queue_manager: true
-# Enabling om_enable_rabbitmq_transient_quorum_queue will have no effect
-# without also enabling om_enable_rabbitmq_quorum_queues.
-# om_enable_rabbitmq_transient_quorum_queue should only be used in conjunction
-# with om_enable_queue_manager.
-om_enable_rabbitmq_transient_quorum_queue: "{{ om_enable_rabbitmq_quorum_queues | bool and om_enable_queue_manager | bool }}"
-# Enabling om_enable_rabbitmq_stream_fanout will have no effect without also
-# enabling om_enable_rabbitmq_quorum_queues.
-# om_enable_rabbitmq_stream_fanout must be used in conjunction with
-# om_enable_rabbitmq_transient_quorum_queue.
-om_enable_rabbitmq_stream_fanout: "{{ om_enable_rabbitmq_quorum_queues | bool and om_enable_rabbitmq_transient_quorum_queue | bool }}"
+om_enable_rabbitmq_stream_fanout: true
 
 ####################
 # Networking options
diff --git a/ansible/roles/aodh/defaults/main.yml b/ansible/roles/aodh/defaults/main.yml
index c1dab047b9..c6836f94da 100644
--- a/ansible/roles/aodh/defaults/main.yml
+++ b/ansible/roles/aodh/defaults/main.yml
@@ -181,28 +181,28 @@ aodh_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "aodh:/var/lib/aodh/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
 aodh_evaluator_default_volumes:
   - "{{ node_config_directory }}/aodh-evaluator/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
 aodh_listener_default_volumes:
   - "{{ node_config_directory }}/aodh-listener/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
 aodh_notifier_default_volumes:
   - "{{ node_config_directory }}/aodh-notifier/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
 
 aodh_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2
index eaf15512f9..02ccaac29b 100644
--- a/ansible/roles/aodh/templates/aodh.conf.j2
+++ b/ansible/roles/aodh/templates/aodh.conf.j2
@@ -61,27 +61,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'aodh-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'aodh-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_concurrency]
 lock_path = /var/lib/aodh/tmp
diff --git a/ansible/roles/barbican/defaults/main.yml b/ansible/roles/barbican/defaults/main.yml
index 212ad950e2..4c2ab66041 100644
--- a/ansible/roles/barbican/defaults/main.yml
+++ b/ansible/roles/barbican/defaults/main.yml
@@ -139,21 +139,21 @@ barbican_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "barbican:/var/lib/barbican/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}"
 barbican_keystone_listener_default_volumes:
   - "{{ node_config_directory }}/barbican-keystone-listener/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}"
 barbican_worker_default_volumes:
   - "{{ node_config_directory }}/barbican-worker/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}"
 
 barbican_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2
index 9385e7a65d..ba8309697c 100644
--- a/ansible/roles/barbican/templates/barbican.conf.j2
+++ b/ansible/roles/barbican/templates/barbican.conf.j2
@@ -84,24 +84,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_middleware]
 enable_proxy_headers_parsing = true
diff --git a/ansible/roles/blazar/defaults/main.yml b/ansible/roles/blazar/defaults/main.yml
index a49f0d8cac..1b2ebc7506 100644
--- a/ansible/roles/blazar/defaults/main.yml
+++ b/ansible/roles/blazar/defaults/main.yml
@@ -124,14 +124,14 @@ blazar_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/blazar:/dev-mode/blazar' if blazar_dev_mode | bool else '' }}"
 blazar_manager_default_volumes:
   - "{{ node_config_directory }}/blazar-manager/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/blazar:/dev-mode/blazar' if blazar_dev_mode | bool else '' }}"
 
 blazar_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/blazar/templates/blazar.conf.j2 b/ansible/roles/blazar/templates/blazar.conf.j2
index 4a4658809a..ddbbeae036 100644
--- a/ansible/roles/blazar/templates/blazar.conf.j2
+++ b/ansible/roles/blazar/templates/blazar.conf.j2
@@ -55,24 +55,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if blazar_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml
index 13fed94d4a..e4c538d90b 100644
--- a/ansible/roles/ceilometer/defaults/main.yml
+++ b/ansible/roles/ceilometer/defaults/main.yml
@@ -124,7 +124,7 @@ ceilometer_notification_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
 ceilometer_central_default_volumes:
   - "{{ node_config_directory }}/ceilometer-central/:{{ container_config_directory }}/:ro"
@@ -132,7 +132,7 @@ ceilometer_central_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "ceilometer:/var/lib/ceilometer/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
 ceilometer_compute_default_volumes:
   - "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro"
@@ -141,7 +141,7 @@ ceilometer_compute_default_volumes:
   - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
   - "ceilometer:/var/lib/ceilometer/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ ceilometer_libvirt_volume }}:/var/lib/libvirt"
   - "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
 ceilometer_ipmi_default_volumes:
@@ -150,7 +150,7 @@ ceilometer_ipmi_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "ceilometer:/var/lib/ceilometer/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
 
 ceilometer_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
index 0e37b586eb..4e40b630b8 100644
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@@ -36,24 +36,18 @@ ca_file = /etc/ceilometer/vmware_ca
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if ceilometer_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index 1a30cb2846..1a292100ba 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -169,7 +169,7 @@ cinder_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/cinder:/dev-mode/cinder' if cinder_dev_mode | bool else '' }}"
 cinder_backup_default_volumes:
   - "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
@@ -187,7 +187,7 @@ cinder_scheduler_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/cinder:/dev-mode/cinder' if cinder_dev_mode | bool else '' }}"
 cinder_volume_default_volumes:
   - "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index b1ec9d675a..9543086ce2 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -71,27 +71,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'cinder-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'cinder-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_middleware]
 enable_proxy_headers_parsing = true
diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml
index fa00614d24..98ffe3fbd3 100644
--- a/ansible/roles/cloudkitty/defaults/main.yml
+++ b/ansible/roles/cloudkitty/defaults/main.yml
@@ -84,14 +84,14 @@ cloudkitty_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/cloudkitty:/dev-mode/cloudkitty' if cloudkitty_dev_mode | bool else '' }}"
 cloudkitty_processor_default_volumes:
   - "{{ node_config_directory }}/cloudkitty-processor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/cloudkitty:/dev-mode/cloudkitty' if cloudkitty_dev_mode | bool else '' }}"
 
 cloudkitty_api_enable_healthchecks: "{{ enable_container_healthchecks }}"
diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
index 02240f876f..7e5562c5c5 100644
--- a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
+++ b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
@@ -45,27 +45,21 @@ policy_file = {{ cloudkitty_policy_file }}
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'cloudkitty-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'cloudkitty-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [collect]
 collector = {{ cloudkitty_collector_backend }}
diff --git a/ansible/roles/cyborg/defaults/main.yml b/ansible/roles/cyborg/defaults/main.yml
index a2d09dbfc4..17ac35877b 100644
--- a/ansible/roles/cyborg/defaults/main.yml
+++ b/ansible/roles/cyborg/defaults/main.yml
@@ -134,21 +134,21 @@ cyborg_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "cyborg:/var/lib/cyborg/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 cyborg_agent_default_volumes:
   - "{{ node_config_directory }}/cyborg-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 cyborg_conductor_default_volumes:
   - "{{ node_config_directory }}/cyborg-conductor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 cyborg_extra_volumes: "{{ default_extra_volumes }}"
 cyborg_api_extra_volumes: "{{ cyborg_extra_volumes }}"
diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2
index 6a08dd60c6..c0adee08ed 100644
--- a/ansible/roles/cyborg/templates/cyborg.conf.j2
+++ b/ansible/roles/cyborg/templates/cyborg.conf.j2
@@ -70,24 +70,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_concurrency]
 lock_path = /var/lib/cyborg/tmp
diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml
index 080d1cda23..b7d85bca21 100644
--- a/ansible/roles/designate/defaults/main.yml
+++ b/ansible/roles/designate/defaults/main.yml
@@ -240,49 +240,49 @@ designate_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
 designate_backend_bind9_default_volumes:
   - "{{ node_config_directory }}/designate-backend-bind9/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "designate_backend_bind9:/var/lib/named/"
 designate_central_default_volumes:
   - "{{ node_config_directory }}/designate-central/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
 designate_mdns_default_volumes:
   - "{{ node_config_directory }}/designate-mdns/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
 designate_producer_default_volumes:
   - "{{ node_config_directory }}/designate-producer/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
 designate_worker_default_volumes:
   - "{{ node_config_directory }}/designate-worker/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
 designate_sink_default_volumes:
   - "{{ node_config_directory }}/designate-sink/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
 
 designate_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2
index 8d44752e6f..4b4937a1bf 100644
--- a/ansible/roles/designate/templates/designate.conf.j2
+++ b/ansible/roles/designate/templates/designate.conf.j2
@@ -93,24 +93,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_concurrency]
 lock_path = /var/lib/designate/tmp
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index 02a0d01a24..9f3e410685 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -201,7 +201,7 @@ glance_api_default_volumes:
   - "{{ glance_file_datadir_volume }}:/var/lib/glance/"
   - "{{ kolla_dev_repos_directory ~ '/glance:/dev-mode/glance' if glance_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   # NOTE(yoctozepto): below to support Cinder iSCSI backends
   - "{% if enable_cinder | bool and enable_cinder_backend_iscsi | bool %}iscsi_info:/etc/iscsi{% endif %}"
   - "{% if enable_cinder | bool and enable_cinder_backend_iscsi | bool %}/dev:/dev{% endif %}"
@@ -210,7 +210,7 @@ glance_tls_proxy_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 glance_extra_volumes: "{{ default_extra_volumes }}"
 glance_api_extra_volumes: "{{ glance_extra_volumes }}"
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index e043c6c6c7..031a962b7b 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -113,24 +113,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if glance_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml
index 5194e8f232..9ba7379c30 100644
--- a/ansible/roles/heat/defaults/main.yml
+++ b/ansible/roles/heat/defaults/main.yml
@@ -159,21 +159,21 @@ heat_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/heat:/dev-mode/heat' if heat_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 heat_api_cfn_default_volumes:
   - "{{ node_config_directory }}/heat-api-cfn/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/heat:/dev-mode/heat' if heat_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 heat_engine_default_volumes:
   - "{{ node_config_directory }}/heat-engine/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/heat:/dev-mode/heat' if heat_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 heat_extra_volumes: "{{ default_extra_volumes }}"
 heat_api_extra_volumes: "{{ heat_extra_volumes }}"
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 54dbf0bb61..e2451082e4 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -72,27 +72,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'heat-api' or service_name == 'heat-api-cfn' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'heat-api' or service_name == 'heat-api-cfn' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if heat_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml
index c0ba474eb5..62e52cea5e 100644
--- a/ansible/roles/ironic/defaults/main.yml
+++ b/ansible/roles/ironic/defaults/main.yml
@@ -232,7 +232,7 @@ ironic_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/ironic:/dev-mode/ironic' if ironic_dev_mode | bool else '' }}"
 ironic_conductor_default_volumes:
   - "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro"
diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
index 19f1820849..4cacef89d1 100644
--- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2
+++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
@@ -13,24 +13,18 @@ transport_url = {{ rpc_transport_url }}
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [ironic]
 {% if ironic_enable_keystone_integration | bool %}
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
index 0e671eba4e..5fcc7b81c4 100644
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -43,25 +43,19 @@ backend = collector
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 processname = {{ service_name }}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'ironic-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if ironic_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml
index 282f396ce6..5c1775dcac 100644
--- a/ansible/roles/keystone/defaults/main.yml
+++ b/ansible/roles/keystone/defaults/main.yml
@@ -158,7 +158,7 @@ keystone_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/keystone:/dev-mode/keystone' if keystone_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "keystone_fernet_tokens:/etc/keystone/fernet-keys"
 
 keystone_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2
index 59b6284977..e1b440d480 100644
--- a/ansible/roles/keystone/templates/keystone.conf.j2
+++ b/ansible/roles/keystone/templates/keystone.conf.j2
@@ -60,27 +60,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'keystone-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'keystone' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if enable_osprofiler | bool %}
 [profiler]
diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml
index 028aff443f..1ae383b539 100644
--- a/ansible/roles/magnum/defaults/main.yml
+++ b/ansible/roles/magnum/defaults/main.yml
@@ -123,7 +123,7 @@ magnum_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/magnum:/dev-mode/magnum' if magnum_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 magnum_conductor_default_volumes:
   - "{{ node_config_directory }}/magnum-conductor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
@@ -131,7 +131,7 @@ magnum_conductor_default_volumes:
   - "magnum:/var/lib/magnum/"
   - "{{ kolla_dev_repos_directory ~ '/magnum:/dev-mode/magnum' if magnum_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 magnum_extra_volumes: "{{ default_extra_volumes }}"
 magnum_api_extra_volumes: "{{ magnum_extra_volumes }}"
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index 854303accd..90b9dfd6ab 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -127,24 +127,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if magnum_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml
index 1d3fb3b43e..62375ca57b 100644
--- a/ansible/roles/manila/defaults/main.yml
+++ b/ansible/roles/manila/defaults/main.yml
@@ -165,7 +165,7 @@ manila_share_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "/lib/modules:/lib/modules:ro"
   - "{{ kolla_dev_repos_directory ~ '/manila:/dev-mode/manila' if manila_dev_mode | bool else '' }}"
 manila_scheduler_default_volumes:
@@ -173,14 +173,14 @@ manila_scheduler_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/manila:/dev-mode/manila' if manila_dev_mode | bool else '' }}"
 manila_api_default_volumes:
   - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/manila:/dev-mode/manila' if manila_dev_mode | bool else '' }}"
 manila_data_default_volumes:
   - "{{ node_config_directory }}/manila-data/:{{ container_config_directory }}/:ro"
diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2
index 836abdd0ab..fa217397c7 100644
--- a/ansible/roles/manila/templates/manila.conf.j2
+++ b/ansible/roles/manila/templates/manila.conf.j2
@@ -57,24 +57,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_middleware]
 enable_proxy_headers_parsing = true
diff --git a/ansible/roles/masakari/defaults/main.yml b/ansible/roles/masakari/defaults/main.yml
index 272d3afb2b..3e6edde3a4 100644
--- a/ansible/roles/masakari/defaults/main.yml
+++ b/ansible/roles/masakari/defaults/main.yml
@@ -112,14 +112,14 @@ masakari_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/masakari:/dev-mode/masakari' if masakari_dev_mode | bool else '' }}"
 masakari_engine_default_volumes:
   - "{{ node_config_directory }}/masakari-engine/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/masakari:/dev-mode/masakari' if masakari_dev_mode | bool else '' }}"
   - "masakari:/var/lib/masakari/"
 masakari_instancemonitor_default_volumes:
@@ -127,14 +127,14 @@ masakari_instancemonitor_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/masakari-monitors:/dev-mode/masakari-monitors' if masakari_dev_mode | bool else '' }}"
 masakari_hostmonitor_default_volumes:
   - "{{ node_config_directory }}/masakari-hostmonitor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/masakari-monitors:/dev-mode/masakari-monitors' if masakari_dev_mode | bool else '' }}"
 
 
diff --git a/ansible/roles/masakari/templates/masakari.conf.j2 b/ansible/roles/masakari/templates/masakari.conf.j2
index e02c46460d..a37dc9a0be 100644
--- a/ansible/roles/masakari/templates/masakari.conf.j2
+++ b/ansible/roles/masakari/templates/masakari.conf.j2
@@ -51,27 +51,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'masakari-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'masakari-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_middleware]
 enable_proxy_headers_parsing = true
diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml
index 563efb8ef0..686dda05de 100644
--- a/ansible/roles/mistral/defaults/main.yml
+++ b/ansible/roles/mistral/defaults/main.yml
@@ -162,28 +162,28 @@ mistral_engine_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}"
 mistral_event_engine_default_volumes:
   - "{{ node_config_directory }}/mistral-event-engine/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}"
 mistral_executor_default_volumes:
   - "{{ node_config_directory }}/mistral-executor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}"
 mistral_api_default_volumes:
   - "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}"
 
 mistral_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2
index 576644a65e..3771aaf80c 100644
--- a/ansible/roles/mistral/templates/mistral.conf.j2
+++ b/ansible/roles/mistral/templates/mistral.conf.j2
@@ -73,24 +73,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if mistral_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 942f270159..5d1b5f90d6 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -513,7 +513,7 @@ neutron_dhcp_agent_default_volumes:
   - "neutron_metadata_socket:/var/lib/neutron/kolla/"
   - "/run/netns:/run/netns:shared"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_l3_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-l3-agent/:{{ container_config_directory }}/:ro"
@@ -523,21 +523,21 @@ neutron_l3_agent_default_volumes:
   - "neutron_metadata_socket:/var/lib/neutron/kolla/"
   - "/run/netns:/run/netns:shared"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_sriov_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-sriov-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_mlnx_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-mlnx-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_eswitchd_default_volumes:
   - "{{ node_config_directory }}/neutron-eswitchd/:{{ container_config_directory }}/:ro"
@@ -545,7 +545,7 @@ neutron_eswitchd_default_volumes:
   - "/run/libvirt:/run/libvirt:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_linuxbridge_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro"
@@ -553,7 +553,7 @@ neutron_linuxbridge_agent_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "/lib/modules:/lib/modules:ro"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_metadata_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-metadata-agent/:{{ container_config_directory }}/:ro"
@@ -561,7 +561,7 @@ neutron_metadata_agent_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "neutron_metadata_socket:/var/lib/neutron/kolla/"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_ovn_metadata_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-ovn-metadata-agent/:{{ container_config_directory }}/:ro"
@@ -570,7 +570,7 @@ neutron_ovn_metadata_agent_default_volumes:
   - "/run/openvswitch:/run/openvswitch:shared"
   - "/run/netns:/run/netns:shared"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_openvswitch_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro"
@@ -579,52 +579,52 @@ neutron_openvswitch_agent_default_volumes:
   - "/lib/modules:/lib/modules:ro"
   - "/run/openvswitch:/run/openvswitch:shared"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_server_default_volumes:
   - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_bgp_dragent_default_volumes:
   - "{{ node_config_directory }}/neutron-bgp-dragent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 neutron_infoblox_ipam_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-infoblox-ipam-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 neutron_metering_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-metering-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 ironic_neutron_agent_default_volumes:
   - "{{ node_config_directory }}/ironic-neutron-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 neutron_tls_proxy_default_volumes:
   - "{{ node_config_directory }}/neutron-tls-proxy/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 neutron_ovn_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-ovn-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 neutron_extra_volumes: "{{ default_extra_volumes }}"
 neutron_dhcp_agent_extra_volumes: "{{ neutron_extra_volumes }}"
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index e8fb0a496a..a33e7a956e 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -132,24 +132,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if neutron_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml
index d42d432b38..4b023df20a 100644
--- a/ansible/roles/nova-cell/defaults/main.yml
+++ b/ansible/roles/nova-cell/defaults/main.yml
@@ -405,28 +405,28 @@ nova_novncproxy_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 nova_spicehtml5proxy_default_volumes:
   - "{{ node_config_directory }}/nova-spicehtml5proxy/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 nova_serialproxy_default_volumes:
   - "{{ node_config_directory }}/nova-serialproxy/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 nova_conductor_default_volumes:
   - "{{ node_config_directory }}/nova-conductor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 nova_compute_default_volumes:
   - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
@@ -446,7 +446,7 @@ nova_compute_ironic_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 # Used by bootstrapping containers.
 nova_cell_bootstrap_default_volumes:
diff --git a/ansible/roles/nova-cell/templates/nova.conf.j2 b/ansible/roles/nova-cell/templates/nova.conf.j2
index cdcafed677..403f99a112 100644
--- a/ansible/roles/nova-cell/templates/nova.conf.j2
+++ b/ansible/roles/nova-cell/templates/nova.conf.j2
@@ -189,27 +189,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == "nova-compute-ironic" %}
 hostname = {{ nova_compute_ironic_custom_host | default(ansible_facts.hostname) }}-ironic
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if service_name in nova_cell_services_require_policy_json and nova_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index 4dd3b611e5..780d262f34 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -199,7 +199,7 @@ nova_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "/lib/modules:/lib/modules:ro"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 nova_metadata_default_volumes:
   - "{{ node_config_directory }}/nova-metadata/:{{ container_config_directory }}/:ro"
@@ -212,14 +212,14 @@ nova_scheduler_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 nova_super_conductor_default_volumes:
   - "{{ node_config_directory }}/nova-super-conductor/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}"
 # Used by bootstrapping containers.
 nova_api_bootstrap_default_volumes:
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index e2c77f7a56..f8bc8a99ea 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -139,27 +139,21 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'nova-api' or service_name == 'nova-metadata' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'nova-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if service_name in nova_services_require_policy_json and nova_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/octavia/defaults/main.yml b/ansible/roles/octavia/defaults/main.yml
index 3a0c8bf827..584b4a1b17 100644
--- a/ansible/roles/octavia/defaults/main.yml
+++ b/ansible/roles/octavia/defaults/main.yml
@@ -189,7 +189,7 @@ octavia_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}"
   - "octavia_driver_agent:/var/run/octavia/"
 octavia_health_manager_default_volumes:
@@ -197,14 +197,14 @@ octavia_health_manager_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}"
 octavia_driver_agent_default_volumes:
   - "{{ node_config_directory }}/octavia-driver-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}"
   - "octavia_driver_agent:/var/run/octavia/"
 octavia_housekeeping_default_volumes:
@@ -212,14 +212,14 @@ octavia_housekeeping_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}"
 octavia_worker_default_volumes:
   - "{{ node_config_directory }}/octavia-worker/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}"
 
 octavia_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2
index a833a3ca59..94b7a39f44 100644
--- a/ansible/roles/octavia/templates/octavia.conf.j2
+++ b/ansible/roles/octavia/templates/octavia.conf.j2
@@ -124,27 +124,21 @@ rpc_thread_pool_size = 2
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'octavia-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'octavia-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if octavia_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml
index 3584610cf5..5f3ceef4b4 100644
--- a/ansible/roles/prechecks/tasks/service_checks.yml
+++ b/ansible/roles/prechecks/tasks/service_checks.yml
@@ -63,12 +63,3 @@
     msg: "We are sorry but enable_ceph is no longer supported. Please use external ceph support."
   when:
     - (enable_ceph | default()) | bool
-
-- name: Validate rabbitmq quorum/stream variables
-  run_once: True
-  fail:
-    msg: |
-      om_enable_rabbitmq_transient_quorum_queue must be enabled when using om_enable_rabbitmq_stream_fanout
-  when:
-    - om_enable_rabbitmq_stream_fanout | bool
-    - not om_enable_rabbitmq_transient_quorum_queue | bool
diff --git a/ansible/roles/rabbitmq/tasks/precheck.yml b/ansible/roles/rabbitmq/tasks/precheck.yml
index abc110908d..bc66f8a4ff 100644
--- a/ansible/roles/rabbitmq/tasks/precheck.yml
+++ b/ansible/roles/rabbitmq/tasks/precheck.yml
@@ -117,11 +117,10 @@
       assert:
         that: "{{ item.type == 'quorum' }}"
         fail_msg: >
-          om_enable_rabbitmq_quorum_queues is True but {{ item.name }} is a non-quorum queue.
+          {{ item.name }} is a non-quorum queue.
           Currently the procedure to migrate to quorum queues is manual.
           Please follow the process described here: https://docs.openstack.org/kolla-ansible/latest/reference/message-queues/rabbitmq.html#high-availability.
           Note that this process may take several hours on larger systems, and may cause a degradation in performance at large scale.
-          If you do not wish to enable this feature, set om_enable_rabbitmq_quorum_queues to False.
       loop: "{{ (rabbitmq_queues.stdout | from_json) if rabbitmq_queues is not skipped else [] }}"
       loop_control:
         label: "{{ item.name }}"
@@ -131,17 +130,15 @@
       assert:
         that: "{{ item.type == 'quorum' }}"
         fail_msg: >
-          om_enable_rabbitmq_transient_quorum_queue is True but {{ item.name }} is a non-quorum queue.
+          {{ item.name }} is a non-quorum queue.
           Currently the procedure to migrate to quorum queues is manual.
           Please follow the process described here: https://docs.openstack.org/kolla-ansible/latest/reference/message-queues/rabbitmq.html#high-availability.
           Note that this process may take several hours on larger systems, and may cause a degradation in performance at large scale.
-          If you do not wish to enable this feature, set om_enable_rabbitmq_transient_quorum_queue to False.
       loop: "{{ (rabbitmq_queues.stdout | from_json) if rabbitmq_queues is not skipped else [] }}"
       loop_control:
         label: "{{ item.name }}"
       when:
         - item.name is search('reply_') or (item.name is search('_fanout') and not om_enable_rabbitmq_stream_fanout | bool)
-        - om_enable_rabbitmq_transient_quorum_queue | bool
 
     - name: Check if RabbitMQ streams need to be configured
       assert:
@@ -162,5 +159,4 @@
   run_once: true
   when:
     - container_facts.containers['rabbitmq'] is defined
-    - om_enable_rabbitmq_quorum_queues | bool
   tags: rabbitmq-ha-precheck
diff --git a/ansible/roles/tacker/defaults/main.yml b/ansible/roles/tacker/defaults/main.yml
index de01fdd310..111e00d887 100644
--- a/ansible/roles/tacker/defaults/main.yml
+++ b/ansible/roles/tacker/defaults/main.yml
@@ -111,7 +111,7 @@ tacker_server_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   # NOTE(yoctozepto): Starting in Train, this volume must be shared
   # between all instances of both Tacker services (Server, Conductor)
   - "kolla_tacker_csar_files:/var/lib/tacker/csar_files/"
@@ -121,7 +121,7 @@ tacker_conductor_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "kolla_tacker_vnfpackages:/var/lib/tacker/vnfpackages/"
   # NOTE(yoctozepto): Starting in Train, this volume must be shared
   # between all instances of both Tacker services (Server, Conductor)
diff --git a/ansible/roles/tacker/templates/tacker.conf.j2 b/ansible/roles/tacker/templates/tacker.conf.j2
index 095df3f5de..34f79ac08a 100644
--- a/ansible/roles/tacker/templates/tacker.conf.j2
+++ b/ansible/roles/tacker/templates/tacker.conf.j2
@@ -69,24 +69,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if tacker_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml
index 2fda7d158f..e1987b708b 100644
--- a/ansible/roles/trove/defaults/main.yml
+++ b/ansible/roles/trove/defaults/main.yml
@@ -138,7 +138,7 @@ trove_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/trove:/dev-mode/trove' if trove_dev_mode | bool else '' }}"
   - "trove:/var/lib/trove/"
 trove_conductor_default_volumes:
@@ -146,7 +146,7 @@ trove_conductor_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/trove:/dev-mode/trove' if trove_dev_mode | bool else '' }}"
   - "trove:/var/lib/trove/"
 trove_taskmanager_default_volumes:
@@ -154,7 +154,7 @@ trove_taskmanager_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/trove:/dev-mode/trove' if trove_dev_mode | bool else '' }}"
   - "trove:/var/lib/trove/"
 
diff --git a/ansible/roles/trove/templates/trove-guestagent.conf.j2 b/ansible/roles/trove/templates/trove-guestagent.conf.j2
index a9f362d272..c3333f6c8d 100644
--- a/ansible/roles/trove/templates/trove-guestagent.conf.j2
+++ b/ansible/roles/trove/templates/trove-guestagent.conf.j2
@@ -17,20 +17,14 @@ user_domain_name = {{ default_user_domain_name }}
 username = {{ trove_keystone_user }}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 [oslo_concurrency]
 lock_path = /var/lib/trove/tmp
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 02b20221aa..276add38d0 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -74,24 +74,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if enable_osprofiler | bool %}
 [profiler]
diff --git a/ansible/roles/venus/defaults/main.yml b/ansible/roles/venus/defaults/main.yml
index faa86c4195..f9da371d72 100644
--- a/ansible/roles/venus/defaults/main.yml
+++ b/ansible/roles/venus/defaults/main.yml
@@ -94,7 +94,7 @@ venus_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/venus:/dev-mode/venus' if venus_dev_mode | bool else '' }}"
   - "venus:/var/lib/venus/"
 venus_manager_default_volumes:
@@ -102,7 +102,7 @@ venus_manager_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/venus:/dev-mode/venus' if venus_dev_mode | bool else '' }}"
   - "venus:/var/lib/venus/"
 
diff --git a/ansible/roles/watcher/defaults/main.yml b/ansible/roles/watcher/defaults/main.yml
index 22a094d265..1cd9ccd2b7 100644
--- a/ansible/roles/watcher/defaults/main.yml
+++ b/ansible/roles/watcher/defaults/main.yml
@@ -137,21 +137,21 @@ watcher_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/watcher:/dev-mode/watcher' if watcher_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 watcher_applier_default_volumes:
   - "{{ node_config_directory }}/watcher-applier/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/watcher:/dev-mode/watcher' if watcher_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 watcher_engine_default_volumes:
   - "{{ node_config_directory }}/watcher-engine/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/watcher:/dev-mode/watcher' if watcher_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 
 watcher_extra_volumes: "{{ default_extra_volumes }}"
 watcher_api_extra_volumes: "{{ watcher_extra_volumes }}"
diff --git a/ansible/roles/watcher/templates/watcher.conf.j2 b/ansible/roles/watcher/templates/watcher.conf.j2
index 58749f5dd6..4200609ef4 100644
--- a/ansible/roles/watcher/templates/watcher.conf.j2
+++ b/ansible/roles/watcher/templates/watcher.conf.j2
@@ -60,24 +60,18 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
-{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
 
 {% if watcher_policy_file is defined %}
 [oslo_policy]
diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml
index 75f7285668..d01eafbd3d 100644
--- a/ansible/roles/zun/defaults/main.yml
+++ b/ansible/roles/zun/defaults/main.yml
@@ -177,14 +177,14 @@ zun_api_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 zun_wsproxy_default_volumes:
   - "{{ node_config_directory }}/zun-wsproxy/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
 zun_compute_default_volumes:
   - "{{ node_config_directory }}/zun-compute/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
@@ -203,7 +203,7 @@ zun_cni_daemon_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
+  - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
   - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
 
diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
index 516b91b023..c16b5f6cb4 100644
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@@ -127,24 +127,18 @@ docker_remote_api_port = 2375
 cni_daemon_port = {{ zun_cni_daemon_port }}
 
 [oslo_messaging_rabbit]
-{% if om_enable_queue_manager | bool %}
 use_queue_manager = true
 {% if service_name == 'zun-api' %}
 processname = {{ service_name }}
 {% endif %}
-{% endif %}
 heartbeat_in_pthread = {{ service_name == 'zun-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
 rabbit_stream_fanout = true
 rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
 {% endif %}
-{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
 rabbit_transient_quorum_queue = true
-{% endif %}
-{% endif %}
diff --git a/releasenotes/notes/add-queue-manager-3ce79655ac37c345.yaml b/releasenotes/notes/add-queue-manager-3ce79655ac37c345.yaml
index 0a2e1edbbb..f904e44cef 100644
--- a/releasenotes/notes/add-queue-manager-3ce79655ac37c345.yaml
+++ b/releasenotes/notes/add-queue-manager-3ce79655ac37c345.yaml
@@ -2,10 +2,8 @@
 features:
   - |
     Added support for using oslo.messaging Queue Manager to all services which
-    use RabbitMQ. This is enabled by default, but can be configured using
-    ``om_enable_queue_manager``.
+    use RabbitMQ. This is enabled by default.
 upgrade:
   - |
     Added support for using oslo.messaging Queue Manager to all services which
-    use RabbitMQ. This is enabled by default, but can be configured using
-    ``om_enable_queue_manager``.
+    use RabbitMQ. This is enabled by default.
diff --git a/releasenotes/notes/enable_quorum_queues_transient-020b373831acda36.yaml b/releasenotes/notes/enable_quorum_queues_transient-020b373831acda36.yaml
index 40be107293..3a81556001 100644
--- a/releasenotes/notes/enable_quorum_queues_transient-020b373831acda36.yaml
+++ b/releasenotes/notes/enable_quorum_queues_transient-020b373831acda36.yaml
@@ -5,8 +5,4 @@ features:
     This helps OpenStack services to be more resilient to message broker
     failures.
     This feature is enabled by default.
-    You can disable it by setting the following in your ``globals.yml``:
-    ``om_enable_rabbitmq_transient_quorum_queue: false``.
-    Notice that this disables quorum queues for all transient/fanout message
-    exchanges and likely reduces the resilience of the system.
     See also `LP#2078339 <https://bugs.launchpad.net/kolla-ansible/+bug/2078339>`_.
diff --git a/releasenotes/notes/rabbitmq-fanout-stream-queue-type-5b73723aa5e9b231.yaml b/releasenotes/notes/rabbitmq-fanout-stream-queue-type-5b73723aa5e9b231.yaml
index 34b8f3a85c..74193e7fc6 100644
--- a/releasenotes/notes/rabbitmq-fanout-stream-queue-type-5b73723aa5e9b231.yaml
+++ b/releasenotes/notes/rabbitmq-fanout-stream-queue-type-5b73723aa5e9b231.yaml
@@ -7,6 +7,4 @@ features:
 upgrade:
   - |
     Stream fanout queues in RabbitMQ (controlled by
-    ``om_enable_rabbitmq_stream_fanout`` variable) is enabled by default when
-    both ``om_enable_rabbitmq_transient_quorum_queue`` and
-    ``om_enable_rabbitmq_quorum_queues`` are ``true``.
+    ``om_enable_rabbitmq_stream_fanout`` variable) is enabled by default.