diff --git a/templates/manila.conf.j2 b/templates/manila.conf.j2
index abe68b8..8b306fd 100644
--- a/templates/manila.conf.j2
+++ b/templates/manila.conf.j2
@@ -59,6 +59,9 @@ rabbit_quorum_queue = {{ manila_oslomsg_rabbit_quorum_queues }}
 rabbit_transient_quorum_queue = {{ manila_oslomsg_rabbit_transient_quorum_queues }}
 rabbit_qos_prefetch_count = {{ manila_oslomsg_rabbit_qos_prefetch_count }}
 use_queue_manager = {{ manila_oslomsg_rabbit_queue_manager }}
+{% if manila_oslomsg_rabbit_queue_manager %}
+hostname = {{ [ansible_facts['hostname'], manila_service_name] | join('-') }}
+{% endif %}
 rabbit_stream_fanout = {{ manila_oslomsg_rabbit_stream_fanout }}
 rabbit_quorum_delivery_limit = {{ manila_oslomsg_rabbit_quorum_delivery_limit }}
 rabbit_quorum_max_memory_bytes = {{ manila_oslomsg_rabbit_quorum_max_memory_bytes }}