diff --git a/cmd/sshpiperd/main.go b/cmd/sshpiperd/main.go
index fdd341b4..64a6c849 100644
--- a/cmd/sshpiperd/main.go
+++ b/cmd/sshpiperd/main.go
@@ -173,9 +173,10 @@ func main() {
 				EnvVars: []string{"SSHPIPERD_DROP_HOSTKEYS_MESSAGE"},
 			},
 			&cli.StringSliceFlag{
-				Name:  "allowed-proxy-addresses",
-				Value: cli.NewStringSlice(),
-				Usage: "allowed proxy addresses, only connections from these ip ranges are allowed to send a proxy header based on the PROXY protocol, empty will disable the PROXY protocol support",
+				Name:    "allowed-proxy-addresses",
+				Value:   cli.NewStringSlice(),
+				Usage:   "allowed proxy addresses, only connections from these ip ranges are allowed to send a proxy header based on the PROXY protocol, empty will disable the PROXY protocol support",
+				EnvVars: []string{"SSHPIPERD_ALLOWED_PROXY_ADDRESSES"},
 			},
 		},
 		Action: func(ctx *cli.Context) error {
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index fbee44c5..df00974a 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -83,6 +83,7 @@ services:
       - SSHPIPERD_LOG_LEVEL=trace
       - SSHPIPERD_E2E_TEST=1
       - SSHPIPERD_DEBUG=${SSHPIPERD_DEBUG}
+      - SSHPIPERD_ALLOWED_PROXY_ADDRESSES=0.0.0.0/0
       - DOCKER_API_VERSION=1.40
     build: 
       context: ../