diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index af7cda18..e225cdd7 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -132,6 +132,9 @@ rabbit_quorum_queue = {{ cinder_oslomsg_rabbit_quorum_queues }}
 rabbit_transient_quorum_queue = {{ cinder_oslomsg_rabbit_transient_quorum_queues }}
 rabbit_qos_prefetch_count = {{ cinder_oslomsg_rabbit_qos_prefetch_count }}
 use_queue_manager = {{ cinder_oslomsg_rabbit_queue_manager }}
+{% if cinder_oslomsg_rabbit_queue_manager %}
+hostname = {{ [ansible_facts['hostname'], cinder_service_name] | join('-') }}
+{% endif %}
 rabbit_stream_fanout = {{ cinder_oslomsg_rabbit_stream_fanout }}
 rabbit_quorum_delivery_limit = {{ cinder_oslomsg_rabbit_quorum_delivery_limit }}
 rabbit_quorum_max_memory_bytes = {{ cinder_oslomsg_rabbit_quorum_max_memory_bytes }}