diff --git a/charms/cinder-k8s/src/templates/cinder.conf.j2 b/charms/cinder-k8s/src/templates/cinder.conf.j2
index 79344d74..63bbdfa0 100644
--- a/charms/cinder-k8s/src/templates/cinder.conf.j2
+++ b/charms/cinder-k8s/src/templates/cinder.conf.j2
@@ -18,3 +18,5 @@ auth_strategy = keystone
 
 [oslo_concurrency]
 lock_path = /var/lib/cinder/tmp
+
+{% include "parts/section-oslo-messaging-rabbit" %}
diff --git a/charms/cinder-k8s/src/templates/parts/section-oslo-messaging-rabbit b/charms/cinder-k8s/src/templates/parts/section-oslo-messaging-rabbit
new file mode 100644
index 00000000..145c4ee9
--- /dev/null
+++ b/charms/cinder-k8s/src/templates/parts/section-oslo-messaging-rabbit
@@ -0,0 +1,2 @@
+[oslo_messaging_rabbit]
+rabbit_quorum_queue = True
diff --git a/charms/cinder-k8s/tests/bundles/smoke.yaml b/charms/cinder-k8s/tests/bundles/smoke.yaml
index e1a7b9f0..5e407039 100644
--- a/charms/cinder-k8s/tests/bundles/smoke.yaml
+++ b/charms/cinder-k8s/tests/bundles/smoke.yaml
@@ -25,9 +25,11 @@ applications:
 
   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