diff --git a/12_torrent/docker-compose.yml b/12_torrent/docker-compose.yml
index a6051e6..2da0108 100644
--- a/12_torrent/docker-compose.yml
+++ b/12_torrent/docker-compose.yml
@@ -1,39 +1,44 @@
 services:
   gluetun:
-    image: qmcgaw/gluetun
+    image: qmcgaw/gluetun:latest
+    restart: unless-stopped
     cap_add:
       - NET_ADMIN
     devices:
       - /dev/net/tun:/dev/net/tun
     environment:
-      - VPN_SERVICE_PROVIDER=private internet access
-      - VPN_TYPE=openvpn
-      - OPENVPN_USER=${PIA_USER}
-      - OPENVPN_PASSWORD=${PIA_PASSWORD}
-      - OPENVPN_PROTOCOL=udp
-      - SERVER_REGIONS=Netherlands
-      - PORT_FORWARD_ONLY=true
+      - VPN_SERVICE_PROVIDER=custom
+      - VPN_TYPE=wireguard
       - VPN_PORT_FORWARDING=on
       - VPN_PORT_FORWARDING_PROVIDER=private internet access
+      - VPN_PORT_FORWARDING_USERNAME=${PIA_USER}
+      - VPN_PORT_FORWARDING_PASSWORD=${PIA_PASSWORD}
+      - SERVER_NAMES=${PIA_SERVER_NAME}
       - VPN_PORT_FORWARDING_STATUS_FILE=/gluetun/forwarded_port
       - TZ=Europe/Paris
+      - FIREWALL_OUTBOUND_SUBNETS=10.10.0.0/24
+      - HEALTH_VPN_DURATION_INITIAL=30s
+      - HEALTH_VPN_DURATION_ADDITION=30s
+      - HEALTH_VPN_INTERVAL=30s
+      - DNS_ADDRESS=1.1.1.1
       - VPN_PORT_FORWARDING_UP_COMMAND=/bin/sh -c 'wget -O- -nv --retry-connrefused --post-data "json={\"listen_port\":{{PORT}},\"current_network_interface\":\"{{VPN_INTERFACE}}\",\"random_port\":false,\"upnp\":false}" http://127.0.0.1:8090/api/v2/app/setPreferences'
       - VPN_PORT_FORWARDING_DOWN_COMMAND=/bin/sh -c 'wget -O- -nv --retry-connrefused --post-data "json={\"listen_port\":0,\"current_network_interface\":\"lo\"}" http://127.0.0.1:8090/api/v2/app/setPreferences'
     volumes:
       - /home/docker/DenGate:/gluetun
+      - /home/docker/DenGate/nl_netherlands-so.conf:/gluetun/wireguard/wg0.conf:ro
     ports:
       - 6881:6881
       - 6881:6881/udp
-      - 8085:8090 # qbittorrent
-      - 8787:8080 # neko
-      - 9696:9696 # prowlarr
-      - 7878:7878 # radarr
-      - 8989:8989 # sonarr
-      - 5055:5055 # seerr
+      - 8085:8090
+      - 8787:8080
+      - 9696:9696
+      - 7878:7878
+      - 8989:8989
+      - 5055:5055
       - 9117:9117
       - 8191:8191
-      - 8265:8265 # tdarr
-      - 8266:8266 # tdarr
+      - 8265:8265
+      - 8266:8266
     networks:
       tan-network:
         ipv4_address: 10.10.0.120
@@ -41,63 +46,54 @@ services:
       - traefik.enable=true
       - traefik.docker.network=tan-network
 
-      # qbittorrent
       - traefik.http.routers.qbittorrent.rule=Host(`torrent.luckyden.org`)
       - traefik.http.routers.qbittorrent.entrypoints=websecure
       - traefik.http.routers.qbittorrent.tls.certresolver=cloudflare
       - traefik.http.routers.qbittorrent.service=qbittorrent
       - traefik.http.services.qbittorrent.loadbalancer.server.port=8090
 
-      # neko
       - traefik.http.routers.neko.rule=Host(`neko.luckyden.org`)
       - traefik.http.routers.neko.entrypoints=websecure
       - traefik.http.routers.neko.tls.certresolver=cloudflare
       - traefik.http.routers.neko.service=neko
       - traefik.http.services.neko.loadbalancer.server.port=8080
 
-      # prowlarr
       - traefik.http.routers.prowlarr.rule=Host(`prowlarr.luckyden.org`)
       - traefik.http.routers.prowlarr.entrypoints=websecure
       - traefik.http.routers.prowlarr.tls.certresolver=cloudflare
       - traefik.http.routers.prowlarr.service=prowlarr
       - traefik.http.services.prowlarr.loadbalancer.server.port=9696
 
-      # radarr
       - traefik.http.routers.radarr.rule=Host(`radarr.luckyden.org`)
       - traefik.http.routers.radarr.entrypoints=websecure
       - traefik.http.routers.radarr.tls.certresolver=cloudflare
       - traefik.http.routers.radarr.service=radarr
       - traefik.http.services.radarr.loadbalancer.server.port=7878
 
-      # sonarr
       - traefik.http.routers.sonarr.rule=Host(`sonarr.luckyden.org`)
       - traefik.http.routers.sonarr.entrypoints=websecure
       - traefik.http.routers.sonarr.tls.certresolver=cloudflare
       - traefik.http.routers.sonarr.service=sonarr
       - traefik.http.services.sonarr.loadbalancer.server.port=8989
 
-      # seerr
       - traefik.http.routers.seerr.rule=Host(`jellyseerr.luckyden.org`)
       - traefik.http.routers.seerr.entrypoints=websecure
       - traefik.http.routers.seerr.tls.certresolver=cloudflare
       - traefik.http.routers.seerr.service=seerr
       - traefik.http.services.seerr.loadbalancer.server.port=5055
 
-      # tdarr
       - traefik.http.routers.tdarr.rule=Host(`tdarr.luckyden.org`)
       - traefik.http.routers.tdarr.entrypoints=websecure
       - traefik.http.routers.tdarr.tls.certresolver=cloudflare
       - traefik.http.routers.tdarr.service=tdarr
       - traefik.http.services.tdarr.loadbalancer.server.port=8265
 
-    restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:9999"]
-      interval: 5s
+      test: ["CMD-SHELL", "/gluetun-entrypoint healthcheck"]
+      interval: 10s
       timeout: 5s
-      start_period: 10s
-      retries: 10
-
+      start_period: 90s
+      retries: 12
 
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
@@ -258,7 +254,6 @@ services:
       gluetun:
         condition: service_healthy
 
-
 networks:
   tan-network:
     external: true
\ No newline at end of file