diff --git a/src/amqproxy/upstream.cr b/src/amqproxy/upstream.cr
index d767187..00fe073 100644
--- a/src/amqproxy/upstream.cr
+++ b/src/amqproxy/upstream.cr
@@ -232,7 +232,7 @@ module AMQProxy
     end
 
     ClientProperties = AMQ::Protocol::Table.new({
-      connection_name: "AMQProxy #{VERSION}",
+      connection_name: System.hostname,
       product:         "AMQProxy",
       version:         VERSION,
       capabilities:    {