diff --git a/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf b/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf
index aadde2db9..ef118b0d9 100644
--- a/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf
+++ b/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf
@@ -2,3 +2,6 @@ HOME=/var/lib/rabbitmq
 LOG_BASE=/var/log/rabbitmq
 MNESIA_BASE=/var/lib/rabbitmq/mnesia
 PID_FILE=/var/run/rabbitmq/pid
+# We need to customize log file names so that they do not have @s
+RABBITMQ_LOGS=$LOG_BASE/$(hostname -s).log
+RABBITMQ_SASL_LOGS=$LOG_BASE/$(hostname -s)-sasl.log