diff --git a/arr_stack/docker-compose.yml b/arr_stack/docker-compose.yml
index d2f970e..537466d 100644
--- a/arr_stack/docker-compose.yml
+++ b/arr_stack/docker-compose.yml
@@ -1,5 +1,43 @@
 ---
 services:
+
+  ### VPN - Mullvad
+  gluetun:
+    image: qmcgaw/gluetun
+    container_name: gluetun
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun:/dev/net/tun
+    ports:
+      - 8888:8888/tcp # HTTP proxy
+      - 8388:8388/tcp # Shadowsocks
+      - 8388:8388/udp # Shadowsocks
+      - 8080:8080/tcp # SABnzbd
+    volumes:
+      - ./volumes/gluetun:/gluetun
+    environment:
+      - PUID=1010
+      - PGID=1010
+      # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup
+      # Also https://github.com/qdm12/gluetun/discussions/805#discussioncomment-2026642
+      # Device Name on Mullvad Website: Bold Dog
+      - VPN_SERVICE_PROVIDER=mullvad
+      - VPN_TYPE=wireguard
+      - WIREGUARD_PRIVATE_KEY=
+      - WIREGUARD_ADDRESSES=
+      # If the VPN server is owned by Mullvad
+      - OWNED_ONLY=yes
+      # Comma separated list of countries
+      - SERVER_COUNTRIES=Switzerland
+      # Comma separated list of cities
+      # - SERVER_CITIES=Zurich
+      # Timezone for accurate log times
+      - TZ=Europe/Berlin
+      # https://github.com/qdm12/gluetun-wiki/blob/main/setup/servers.md#update-the-vpn-servers-list
+      - UPDATER_PERIOD=24h
+    restart: unless-stopped
+
   ### Downloader - Usenet
   sabnzbd:
     image: linuxserver/sabnzbd:latest
@@ -10,14 +48,16 @@ services:
       - UMASK=0022
       - TZ=Europe/Berlin
     volumes:
-      - /volume2/docker/arr/sabnzbd:/config
-      - /volume2/docker/arr/Downloads/complete:/downloads
-      - /volume2/docker/arr/Downloads/incomplete:/incomplete-downloads
-    ports:
-      - 8080:8080
+      - ./volumes/sabnzbd:/config
+      - ./volumes/downloads/complete:/downloads
+      - ./volumes/downloads/incomplete:/incomplete-downloads
     restart: unless-stopped
+    network_mode: "service:gluetun"
+    depends_on:
+      gluetun:
+        condition: service_healthy
 
-  ### Media Manager
+  ### Media Manager - Filebot
   filebot:
     image: jlesage/filebot
     container_name: filebot
@@ -42,24 +82,12 @@ services:
       - AMC_ANIME_FORMAT={n.colon(' - ')} ({y})/Staffel {s.pad(2)}/{s00e00}_{n.colon(' - ')}_{t.colon(' - ').replace('?','').replace('!','')}
       - AMC_PROCESS_MUSIC=y
     volumes:
-      - /volume2/docker/arr/filebot:/config:rw
-      - /volume2/docker/arr/Downloads/complete:/storage:rw
-      - /volume2/docker/arr/Downloads/complete:/watch:rw
-      - /volume2/docker/arr/Downloads/renamed:/output:rw
-    ports:
-      - 5800:5800
+      - ./volumes/filebot:/config:rw
+      - ./volumes/downloads/complete:/storage:rw
+      - ./volumes/downloads/complete:/watch:rw
+      - ./volumes/downloads/renamed:/output:rw
     restart: unless-stopped
-
-  ### Content Request Management
-  # jellyseerr:
-  #  image: fallenbagel/jellyseerr:latest
-  #  container_name: jellyseerr
-  #  environment:
-  #    - LOG_LEVEL=debug
-  #    - UMASK=022
-  #    - TZ=Europe/Berlin
-  #  volumes:
-  #    - /volume2/docker/arr/jellyseerr:/app/config
-  #  ports:
-  #    - 5055:5055
-  #  restart: unless-stopped
+    network_mode: "service:gluetun"
+    depends_on:
+      gluetun:
+        condition: service_healthy
diff --git a/arr/docker-compose.yml b/arr_stack/docker-compose.yml_index
similarity index 100%
rename from arr/docker-compose.yml
rename to arr_stack/docker-compose.yml_index