diff --git a/.env b/.env
index a4c0efb..98c265b 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
 ## Common configuration
+WG_GATEWAY_PORT=47390
 WG_GATEWAY_IP=10.254.0.1/16, df99:23eb:1682:fe::1/64
 WG_CLIENT_IP=10.254.0.2/16, df99:23eb:1682:fe::2/64
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7766b75..0142b3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@
 
     environment:
       ## Common configuration
+      - WG_GATEWAY_PORT=${WG_GATEWAY_PORT}
       - WG_GATEWAY_IP=${WG_GATEWAY_IP}
       - WG_CLIENT_IP=${WG_CLIENT_IP}
       ## Keys (for gateway)
diff --git a/infra/root/setup.sh b/infra/root/setup.sh
index 3f78285..f7a36d5 100755
--- a/infra/root/setup.sh
+++ b/infra/root/setup.sh
@@ -29,7 +29,7 @@
 echo "[Interface]
 PrivateKey = ${WG_GATEWAY_PRIVATE_KEY}
 Address = ${WG_GATEWAY_IP}
-ListenPort = 47390
+ListenPort = ${WG_GATEWAY_PORT}
 
 [Peer]
 PublicKey = ${WG_CLIENT_PUBLIC_KEY}