diff --git a/docker-compose.d/Documentation/bookstack-stack.yml b/docker-compose.d/Documentation/bookstack-stack.yml
index 2858b3f..60857bf 100644
--- a/docker-compose.d/Documentation/bookstack-stack.yml
+++ b/docker-compose.d/Documentation/bookstack-stack.yml
@@ -15,8 +15,6 @@ services:
       - bookstack:/config
     depends_on:
       - bookstack_db
-    ports:
-      - 8989:80
     secrets:
       - PASS
     networks:
diff --git a/docker-compose.d/Media/arr-stack.yml b/docker-compose.d/Media/arr-stack.yml
new file mode 100644
index 0000000..84479aa
--- /dev/null
+++ b/docker-compose.d/Media/arr-stack.yml
@@ -0,0 +1,43 @@
+services:
+  prowlarr:
+    image: lscr.io/linuxserver/prowlarr:latest
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - prowlarr:/config
+    ports:
+      - 9696:9696
+    networks:
+      - arr
+      - qbit
+
+  sonarr:
+    image: lscr.io/linuxserver/sonarr:latest
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - sonarr:/config
+      - /mnt/massdrive/media:/mnt/media
+    ports:
+      - 8989:8989
+    networks:
+      - arr
+      - qbit
+
+networks:
+  arr:
+    name: arr
+    external: true
+  qbit:
+    name: qbit
+    external: true
+
+volumes:
+  prowlarr:
+    name: prowlarr
+  sonarr:
+    name: sonarr
diff --git a/docker-compose.yml b/docker-compose.yml
index 931ed75..0f9044b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,6 @@ networks:
   shoko:
     name: shoko
     external: true
-  arr:
-    name: arr
 
 services:
   gluetun:
@@ -50,39 +48,6 @@ services:
     networks:
       - caddy
 
-  prowlarr:
-    image: lscr.io/linuxserver/prowlarr:latest
-    container_name: prowlarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - prowlarr:/config
-    ports:
-      - 9696:9696
-    restart: unless-stopped
-    networks:
-      - arr
-      - qbit
-
-  sonarr:
-    image: lscr.io/linuxserver/sonarr:latest
-    container_name: sonarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - sonarr:/config
-      - /mnt/massdrive/media:/mnt/media
-    ports:
-      - 8989:8989
-    restart: unless-stopped
-    networks:
-      - arr
-      - qbit
-
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
     container_name: qbittorrent
@@ -215,11 +180,6 @@ volumes:
     external: true
   ariang:
     name: ariang
-  sonarr:
-    name: sonarr
-  prowlarr:
-    name: prowlarr
-    external: true
   nextcloud_aio_mastercontainer:
     name: nextcloud_aio_mastercontainer
   bitmonero: