diff --git a/portainer_agent/rootfs/etc/services.d/portainer_agent/run b/portainer_agent/rootfs/etc/services.d/portainer_agent/run
index b14f5ff30..fd47fc233 100755
--- a/portainer_agent/rootfs/etc/services.d/portainer_agent/run
+++ b/portainer_agent/rootfs/etc/services.d/portainer_agent/run
@@ -7,6 +7,9 @@ bashio::log.info "Starting app"
 
 cd /app || exit 1
 
+container_name="${HOSTNAME//-/_}"
+export HOSTNAME="${container_name}"
+
 args=()
 if bashio::config.has_value 'PORTAINER_AGENT_ARGS'; then
   read -r -a args <<<"$(bashio::config 'PORTAINER_AGENT_ARGS')"