diff --git a/compose.yaml b/compose.yaml
index 7aefcf0..824f2e0 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -6,23 +6,20 @@ networks:
 services:
 
   wireguard:
-    image: lscr.io/linuxserver/wireguard:latest
-    container_name: wireguard
+    image: qmcgaw/gluetun:latest
+    container_name: gluetun
     cap_add:
       - NET_ADMIN
-      - SYS_MODULE #optional
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Berlin
-    volumes:
-      - /app-config/wireguard/:/config
-      - /lib/modules:/lib/modules #optional
+      - VPN_SERVICE_PROVIDER=opnsense
+      - VPN_TYPE=wireguard
+      - WIREGUARD_PRIVATE_KEY=${WIREGUARD_PRIVATE_KEY}
+      - WIREGUARD_ADDRESS=${WIREGUARD_ADDRESS}
+      - WIREGUARD_PRESHARED_KEY=${WIREGUARD_PRESHARED_KEY}
+      - WIREGUARD_ENDPOINT_IP=${WIREGUARD_ENDPOINT_IP}
+      - WIREGUARD_ENDPOINT_PORT=${WIREGUARD_ENDPOINT_PORT}
     ports:
-      - 51820:51820/udp
-      - 8080:8080
-    sysctls:
-      - net.ipv4.conf.all.src_valid_mark=1
+      - 8080:8080 # Für sabnzbd
     restart: unless-stopped
     networks:
       - media_network