diff --git a/agent/pkg/agent/templates/agent.compose.yml b/agent/pkg/agent/templates/agent.compose.yml
index 3da60f7..bb10d1f 100644
--- a/agent/pkg/agent/templates/agent.compose.yml
+++ b/agent/pkg/agent/templates/agent.compose.yml
@@ -9,9 +9,9 @@ services:
       AGENT_PORT: "{{.Port}}"
       AGENT_CA_CERT: "{{.CACert}}"
       AGENT_SSL_CERT: "{{.SSLCert}}"
-      # docker socket proxy: [host]:port
-      # unset DOCKER_SOCKET_ADDR to disable
-      DOCKER_SOCKET_ADDR: 127.0.0.1:2375
+      # use agent as a docker socket proxy: [host]:port
+      # set LISTEN_ADDR to enable (e.g. 127.0.0.1:2375)
+      LISTEN_ADDR:
       POST: false
       ALLOW_RESTARTS: false
       ALLOW_START: false
diff --git a/agent/pkg/env/env.go b/agent/pkg/env/env.go
index 74caddb..c1c74fd 100644
--- a/agent/pkg/env/env.go
+++ b/agent/pkg/env/env.go
@@ -20,6 +20,7 @@ var (
 	AgentSkipClientCertCheck bool
 	AgentCACert              string
 	AgentSSLCert             string
+	DockerSocket             string
 )
 
 func init() {
@@ -27,6 +28,7 @@ func init() {
 }
 
 func Load() {
+	DockerSocket = common.GetEnvString("DOCKER_SOCKET", "/var/run/docker.sock")
 	AgentName = common.GetEnvString("AGENT_NAME", DefaultAgentName())
 	AgentPort = common.GetEnvInt("AGENT_PORT", 8890)
 	AgentSkipClientCertCheck = common.GetEnvBool("AGENT_SKIP_CLIENT_CERT_CHECK", false)
diff --git a/socket-proxy/pkg/env.go b/socket-proxy/pkg/env.go
index 723cf04..66ef898 100644
--- a/socket-proxy/pkg/env.go
+++ b/socket-proxy/pkg/env.go
@@ -68,7 +68,7 @@ func stringstring(s string) (string, error) {
 }
 
 func Load() {
-	DockerSocket = GetEnvString("DOCKER_SOCKET", GetEnvString("DOCKER_HOST", "/var/run/docker.sock"))
+	DockerSocket = GetEnvString("DOCKER_SOCKET", "/var/run/docker.sock")
 	ListenAddr = GetEnvString("LISTEN_ADDR", GetEnvString("DOCKER_SOCKET_ADDR", "")) // default to disabled
 
 	DockerPost = GetEnvBool("POST", false)