diff --git a/agent.compose.yml b/agent.compose.yml
index b9e903e..0a65186 100644
--- a/agent.compose.yml
+++ b/agent.compose.yml
@@ -5,8 +5,8 @@ services:
     restart: always
     network_mode: host # do not change this
     environment:
-      GODOXY_AGENT_NAME: "agent-1"
-      GODOXY_AGENT_PORT: "8890"
+      GODOXY_AGENT_NAME: # defaults to hostname
+      GODOXY_AGENT_PORT: # defaults to 8890
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./certs:/app/certs # store Agent CA cert and Agent SSL cert
diff --git a/agent/pkg/env/env.go b/agent/pkg/env/env.go
index 870f9f6..1d75454 100644
--- a/agent/pkg/env/env.go
+++ b/agent/pkg/env/env.go
@@ -1,8 +1,20 @@
 package env
 
-import "github.com/yusing/go-proxy/internal/common"
+import (
+	"os"
+
+	"github.com/yusing/go-proxy/internal/common"
+)
+
+func DefaultAgentName() string {
+	name, err := os.Hostname()
+	if err != nil {
+		return "agent"
+	}
+	return name
+}
 
 var (
-	AgentName = common.GetEnvString("AGENT_NAME", "agent")
+	AgentName = common.GetEnvString("AGENT_NAME", DefaultAgentName())
 	AgentPort = common.GetEnvInt("AGENT_PORT", 8890)
 )