diff --git a/deploy/.env.example b/deploy/.env.example
index 2dee470..282575a 100644
--- a/deploy/.env.example
+++ b/deploy/.env.example
@@ -15,10 +15,11 @@ DEFAULT_GATEWAY_PUBLIC_KEY=replace-me
 GATEWAY_BOOTSTRAP_TOKEN=nexavpn-gateway-bootstrap
 NEXAVPN_GATEWAY_ID=
 NEXAVPN_GATEWAY_NAME=primary-gateway
-NEXAVPN_GATEWAY_SYNC_URL=http://backend:8080/api/v1/gateway-agent
-NEXAVPN_GATEWAY_BOOTSTRAP_URL=http://backend:8080/api/v1/gateway-agent/bootstrap
+NEXAVPN_GATEWAY_SYNC_URL=http://host.docker.internal:8080/api/v1/gateway-agent
+NEXAVPN_GATEWAY_BOOTSTRAP_URL=http://host.docker.internal:8080/api/v1/gateway-agent/bootstrap
 NEXAVPN_API_TOKEN=
 NEXAVPN_GATEWAY_PRIVATE_KEY=
 NEXAVPN_GATEWAY_INTERFACE=wg0
 NEXAVPN_UPLINK_INTERFACE=eth0
 NEXAVPN_ENABLE_MASQUERADE=true
+NEXAVPN_BACKEND_HOST=host.docker.internal
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 940c614..e012998 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -69,12 +69,14 @@ services:
       - SYS_MODULE
     devices:
       - /dev/net/tun:/dev/net/tun
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     environment:
       GATEWAY_BOOTSTRAP_TOKEN: ${GATEWAY_BOOTSTRAP_TOKEN:-nexavpn-gateway-bootstrap}
       NEXAVPN_GATEWAY_ID: ${NEXAVPN_GATEWAY_ID:-}
       NEXAVPN_GATEWAY_NAME: ${NEXAVPN_GATEWAY_NAME:-primary-gateway}
-      NEXAVPN_GATEWAY_SYNC_URL: ${NEXAVPN_GATEWAY_SYNC_URL:-http://backend:8080/api/v1/gateway-agent}
-      NEXAVPN_GATEWAY_BOOTSTRAP_URL: ${NEXAVPN_GATEWAY_BOOTSTRAP_URL:-http://backend:8080/api/v1/gateway-agent/bootstrap}
+      NEXAVPN_GATEWAY_SYNC_URL: ${NEXAVPN_GATEWAY_SYNC_URL:-http://host.docker.internal:8080/api/v1/gateway-agent}
+      NEXAVPN_GATEWAY_BOOTSTRAP_URL: ${NEXAVPN_GATEWAY_BOOTSTRAP_URL:-http://host.docker.internal:8080/api/v1/gateway-agent/bootstrap}
       DEFAULT_GATEWAY_ENDPOINT: ${DEFAULT_GATEWAY_ENDPOINT:-localhost:51820}
       DEFAULT_VPN_CIDR: ${DEFAULT_VPN_CIDR:-100.96.0.0/24}
       NEXAVPN_API_TOKEN: ${NEXAVPN_API_TOKEN:-}
@@ -82,7 +84,7 @@ services:
       NEXAVPN_GATEWAY_INTERFACE: ${NEXAVPN_GATEWAY_INTERFACE:-wg0}
       NEXAVPN_UPLINK_INTERFACE: ${NEXAVPN_UPLINK_INTERFACE:-eth0}
       NEXAVPN_ENABLE_MASQUERADE: ${NEXAVPN_ENABLE_MASQUERADE:-true}
-      NEXAVPN_BACKEND_HOST: ${NEXAVPN_BACKEND_HOST:-backend}
+      NEXAVPN_BACKEND_HOST: ${NEXAVPN_BACKEND_HOST:-host.docker.internal}
     volumes:
       - ./scripts/gateway-entrypoint.sh:/scripts/gateway-entrypoint.sh:ro
       - gateway-state:/var/lib/nexavpn