diff --git a/charms/neutron-k8s/src/templates/neutron.conf.j2 b/charms/neutron-k8s/src/templates/neutron.conf.j2
index 8030c58e..a0c3ff7d 100644
--- a/charms/neutron-k8s/src/templates/neutron.conf.j2
+++ b/charms/neutron-k8s/src/templates/neutron.conf.j2
@@ -67,3 +67,5 @@ user_domain_name = {{ identity_service.service_domain_name }}
 project_name = {{ identity_service.service_project_name }}
 username = {{ identity_service.service_user_name }}
 password = {{ identity_service.service_password }}
+
+{% include "parts/section-oslo-messaging-rabbit" %}
diff --git a/charms/neutron-k8s/src/templates/parts/section-oslo-messaging-rabbit b/charms/neutron-k8s/src/templates/parts/section-oslo-messaging-rabbit
new file mode 100644
index 00000000..145c4ee9
--- /dev/null
+++ b/charms/neutron-k8s/src/templates/parts/section-oslo-messaging-rabbit
@@ -0,0 +1,2 @@
+[oslo_messaging_rabbit]
+rabbit_quorum_queue = True
diff --git a/charms/neutron-k8s/tests/bundles/smoke.yaml b/charms/neutron-k8s/tests/bundles/smoke.yaml
index 496157cd..d535be0c 100644
--- a/charms/neutron-k8s/tests/bundles/smoke.yaml
+++ b/charms/neutron-k8s/tests/bundles/smoke.yaml
@@ -20,9 +20,11 @@ applications:
     trust: false
   rabbitmq:
     charm: ch:rabbitmq-k8s
-    channel: 3.9/edge
+    channel: 3.12/edge
     scale: 1
     trust: true
+    options:
+      minimum-replicas: 1
   keystone:
     charm: ch:keystone-k8s
     channel: yoga/edge