diff --git a/templates/compose/wireguard-easy.yaml b/templates/compose/wireguard-easy.yaml
index 7ccf60554..311ca88d1 100644
--- a/templates/compose/wireguard-easy.yaml
+++ b/templates/compose/wireguard-easy.yaml
@@ -8,11 +8,11 @@ services:
   wg-easy:
     image: ghcr.io/wg-easy/wg-easy:latest
     environment:
-      - SERVICE_FQDN_WIREGUARDEASY_8000
+      - SERVICE_FQDN_WIREGUARDEASY_51821
       - WG_HOST=${SERVICE_FQDN_WIREGUARDEASY}
       - LANG=${LANG:-en}
-      - PORT=8000
       - WG_PORT=51820
+      - _PASSWORD=${SERVICE_PASSWORD_ADMIN}
     volumes:
       - wg-easy:/etc/wireguard
     ports:
@@ -23,3 +23,9 @@ services:
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
       - net.ipv4.ip_forward=1
+    entrypoint:
+      - /bin/bash
+      - -c
+      - |
+        eval "wgpw '${SERVICE_PASSWORD_ADMIN}' > /pass-hash"
+        eval "$(cat /pass-hash) dumb-init node server.js"