diff --git a/charts/stable/wg-easy/Chart.yaml b/charts/stable/wg-easy/Chart.yaml
index 39203f9f20f..90b6fd9faee 100644
--- a/charts/stable/wg-easy/Chart.yaml
+++ b/charts/stable/wg-easy/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/wg-easy
   - https://github.com/WeeJeWel/wg-easy
 type: application
-version: 4.0.15
+version: 4.0.16
 annotations:
   truecharts.org/catagories: |
     - networking
diff --git a/charts/stable/wg-easy/values.yaml b/charts/stable/wg-easy/values.yaml
index a04baeb6b05..e7521ddfc24 100644
--- a/charts/stable/wg-easy/values.yaml
+++ b/charts/stable/wg-easy/values.yaml
@@ -2,27 +2,7 @@ image:
   repository: tccr.io/truecharts/wg-easy
   pullPolicy: IfNotPresent
   tag: latest@sha256:5cc96ad86c87fb2ebc7dab65fc5b190ff0dcce370d0b9afa4aa4b5b2580a5000
-service:
-  main:
-    ports:
-      main:
-        targetPort: 51821
-        port: 51821
-  vpn:
-    enabled: true
-    ports:
-      vpn:
-        enabled: true
-        protocol: udp
-        port: 51820
-        targetPort: 51820
-persistence:
-  config:
-    enabled: true
-    mountPath: "/etc/wireguard"
-portal:
-  open:
-    enabled: true
+
 securityContext:
   container:
     PUID: 0
@@ -35,6 +15,20 @@ securityContext:
         - NET_ADMIN
         - NET_RAW
         - SYS_MODULE
+
+service:
+  main:
+    ports:
+      main:
+        port: 51821
+  vpn:
+    enabled: true
+    ports:
+      vpn:
+        enabled: true
+        protocol: udp
+        port: 51820
+
 workload:
   main:
     podSpec:
@@ -49,9 +43,20 @@ workload:
               type: tcp
           env:
             WG_HOST: "localhost"
+            PORT: "{{ .Values.service.main.ports.main.port }}"
+            WG_PORT: "{{ .Values.service.vpn.ports.vpn.port }}"
             WG_MTU: 1420
             WG_PERSISTENT_KEEPALIVE: 0
             WG_DEFAULT_ADDRESS: "10.8.0.x"
             WG_DEFAULT_DNS: "1.1.1.1"
             WG_ALLOWED_IPS: "0.0.0.0/0, ::/0"
             PASSWORD: "secretpass"
+
+persistence:
+  config:
+    enabled: true
+    mountPath: "/etc/wireguard"
+
+portal:
+  open:
+    enabled: true