diff --git a/projects/downloader/project.yml b/projects/downloader/project.yml
index e1b7c2f6..29b2bc1f 100644
--- a/projects/downloader/project.yml
+++ b/projects/downloader/project.yml
@@ -10,11 +10,10 @@ apps:
   targetRevision: add/qbittorrent
   path: charts/qbittorrent
   secrets:
-  - name: vpn-config
+  - name: wireguard
     keys:
-    - SERVER_CITIES
-    - OPENVPN_USER
     - WIREGUARD_PRIVATE_KEY
+    - WIREGUARD_PUBLIC_KEY
 
 
 - name: youtubedl
diff --git a/projects/downloader/values/qbittorrent.yaml b/projects/downloader/values/qbittorrent.yaml
index a66babb6..0ed2102b 100644
--- a/projects/downloader/values/qbittorrent.yaml
+++ b/projects/downloader/values/qbittorrent.yaml
@@ -84,31 +84,27 @@ addons:
     enabled: true
 
     env:
-      VPN_SERVICE_PROVIDER: mullvad
-      VPN_TYPE: openvpn
-      WIREGUARD_ADDRESSES: 10.67.135.224/32
-     
-      # Fix: https://github.com/qdm12/gluetun/issues/1569#issuecomment-1549992099
-      OPENVPN_CIPHERS: AES-256-GCM
+      VPN_SERVICE_PROVIDER: custom
+      VPN_TYPE: wireguard
+      WIREGUARD_ADDRESSES: 10.2.0.2/32
+      VPN_ENDPOINT_IP: 89.39.104.173
+      VPN_ENDPOINT_PORT: 51820
 
-      DNS_KEEP_NAMESERVER: "on"
+      DNS_KEEP_NAMESERVER: "off"
       DOT: "on"
       FIREWALL: "on"
       FIREWALL_INPUT_PORTS: "8080,8000"
-      FIREWALL_VPN_INPUT_PORTS: 61086
 
     envFrom:
     - secretRef:
-        name: wireguard-config
+        name: wireguard
 
     securityContext:
       capabilities:
         add:
           - NET_ADMIN
 
-    livenessProbe:
-      httpGet:
-        path: /v1/openvpn/status
-        port: 8000
-      initialDelaySeconds: 30
-      periodSeconds: 30
+additionalContainers:
+  qbittorrent-natmap:
+    name: qbittorrent-natmap
+    image: ghcr.io/soxfor/qbittorrent-natmap