diff --git a/servers/legion/k8s/media/fornax-external-secrets.yaml b/servers/legion/k8s/media/fornax-external-secrets.yaml
index e5d67a0..bbc8900 100644
--- a/servers/legion/k8s/media/fornax-external-secrets.yaml
+++ b/servers/legion/k8s/media/fornax-external-secrets.yaml
@@ -18,6 +18,14 @@ spec:
       remoteRef:
         key: secret/data/fornax/worker-tx253
         property: private_key
+    - secretKey: PROTONVPN_PEER_PUBLIC_KEY
+      remoteRef:
+        key: secret/data/fornax/worker-tx253
+        property: public_key
+    - secretKey: PROTONVPN_ENDPOINT_IP
+      remoteRef:
+        key: secret/data/fornax/worker-tx253
+        property: endpoint_ip
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
@@ -37,3 +45,11 @@ spec:
       remoteRef:
         key: secret/data/fornax/worker-tx34
         property: private_key
+    - secretKey: PROTONVPN_PEER_PUBLIC_KEY
+      remoteRef:
+        key: secret/data/fornax/worker-tx34
+        property: public_key
+    - secretKey: PROTONVPN_ENDPOINT_IP
+      remoteRef:
+        key: secret/data/fornax/worker-tx34
+        property: endpoint_ip
diff --git a/servers/legion/k8s/media/fornax-workers.yaml b/servers/legion/k8s/media/fornax-workers.yaml
index eecc248..bc84093 100644
--- a/servers/legion/k8s/media/fornax-workers.yaml
+++ b/servers/legion/k8s/media/fornax-workers.yaml
@@ -92,7 +92,7 @@ spec:
               add: ["NET_ADMIN"]
           env:
             - name: VPN_SERVICE_PROVIDER
-              value: "protonvpn"
+              value: "custom"
             - name: VPN_TYPE
               value: "wireguard"
             - name: WIREGUARD_PRIVATE_KEY
@@ -100,12 +100,20 @@ spec:
                 secretKeyRef:
                   name: fornax-worker-tx253-secrets
                   key: PROTONVPN_PRIVATE_KEY
-            - name: SERVER_NAMES
-              value: "US-TX#179"
-            - name: VPN_PORT_FORWARDING
-              value: "off"
-            - name: UPDATER_PERIOD
-              value: "2m"
+            - name: WIREGUARD_PUBLIC_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: fornax-worker-tx253-secrets
+                  key: PROTONVPN_PEER_PUBLIC_KEY
+            - name: WIREGUARD_ENDPOINT_IP
+              valueFrom:
+                secretKeyRef:
+                  name: fornax-worker-tx253-secrets
+                  key: PROTONVPN_ENDPOINT_IP
+            - name: WIREGUARD_ENDPOINT_PORT
+              value: "51820"
+            - name: WIREGUARD_ADDRESSES
+              value: "10.2.0.2/32"
             - name: DOT
               value: "off"
             - name: DNS_UPSTREAM_RESOLVER_TYPE
@@ -344,7 +352,7 @@ spec:
               add: ["NET_ADMIN"]
           env:
             - name: VPN_SERVICE_PROVIDER
-              value: "protonvpn"
+              value: "custom"
             - name: VPN_TYPE
               value: "wireguard"
             - name: WIREGUARD_PRIVATE_KEY
@@ -352,10 +360,20 @@ spec:
                 secretKeyRef:
                   name: fornax-worker-tx34-secrets
                   key: PROTONVPN_PRIVATE_KEY
-            - name: SERVER_NAMES
-              value: "US-TX#220"
-            - name: VPN_PORT_FORWARDING
-              value: "on"
+            - name: WIREGUARD_PUBLIC_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: fornax-worker-tx34-secrets
+                  key: PROTONVPN_PEER_PUBLIC_KEY
+            - name: WIREGUARD_ENDPOINT_IP
+              valueFrom:
+                secretKeyRef:
+                  name: fornax-worker-tx34-secrets
+                  key: PROTONVPN_ENDPOINT_IP
+            - name: WIREGUARD_ENDPOINT_PORT
+              value: "51820"
+            - name: WIREGUARD_ADDRESSES
+              value: "10.2.0.2/32"
             - name: DOT
               value: "off"
             - name: DNS_UPSTREAM_RESOLVER_TYPE