diff --git a/templates/trove-guestagent.conf.j2 b/templates/trove-guestagent.conf.j2
index 7eead53..a1654d2 100644
--- a/templates/trove-guestagent.conf.j2
+++ b/templates/trove-guestagent.conf.j2
@@ -35,6 +35,9 @@ rabbit_quorum_queue = {{ trove_guest_oslomsg_rabbit_quorum_queues }}
 rabbit_transient_quorum_queue = {{ trove_guest_oslomsg_rabbit_transient_quorum_queues }}
 rabbit_qos_prefetch_count = {{ trove_guest_oslomsg_rabbit_qos_prefetch_count }}
 use_queue_manager = {{ trove_guest_oslomsg_rabbit_queue_manager }}
+{% if trove_guest_oslomsg_rabbit_queue_manager %}
+hostname = {{ [ansible_facts['hostname'], 'guest', trove_service_name] | join('-') }}
+{% endif %}
 rabbit_stream_fanout = {{ trove_guest_oslomsg_rabbit_stream_fanout }}
 rabbit_quorum_delivery_limit = {{ trove_oslomsg_rabbit_quorum_delivery_limit }}
 rabbit_quorum_max_memory_bytes = {{ trove_oslomsg_rabbit_quorum_max_memory_bytes }}
diff --git a/templates/trove.conf.j2 b/templates/trove.conf.j2
index 76c8f8c..d8e4676 100644
--- a/templates/trove.conf.j2
+++ b/templates/trove.conf.j2
@@ -130,6 +130,9 @@ rabbit_quorum_queue = {{ trove_oslomsg_rabbit_quorum_queues }}
 rabbit_transient_quorum_queue = {{ trove_oslomsg_rabbit_transient_quorum_queues }}
 rabbit_qos_prefetch_count = {{ trove_oslomsg_rabbit_qos_prefetch_count }}
 use_queue_manager = {{ trove_oslomsg_rabbit_queue_manager }}
+{% if trove_oslomsg_rabbit_queue_manager %}
+hostname = {{ [ansible_facts['hostname'], trove_service_name] | join('-') }}
+{% endif %}
 rabbit_stream_fanout = {{ trove_oslomsg_rabbit_stream_fanout }}
 rabbit_quorum_delivery_limit = {{ trove_oslomsg_rabbit_quorum_delivery_limit }}
 rabbit_quorum_max_memory_bytes = {{ trove_oslomsg_rabbit_quorum_max_memory_bytes }}