diff --git a/pi/nzbhydra2/docker-compose.yml b/pi/nzbhydra2/docker-compose.yml
new file mode 100644
index 0000000..73df283
--- /dev/null
+++ b/pi/nzbhydra2/docker-compose.yml
@@ -0,0 +1,30 @@
+---
+services:
+  nzbhydra2:
+    image: lscr.io/linuxserver/nzbhydra2:latest
+    container_name: nzbhydra2
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/New_York
+    volumes:
+      - nzbhydra2_data:/config
+      - nfs-downloads:/downloads
+
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.nzbhydra2.loadbalancer.server.port=5076"
+ 
+volumes:
+  nzbhydra2_data:
+    driver: local
+    name: nzbhydra2_data
+
+
+  nfs-downloads:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=192.168.0.145,nolock,soft,rw
+      device: ":/volume1/downloads"
diff --git a/pi/prowlarr/docker-compose.yml b/pi/prowlarr/docker-compose.yml
deleted file mode 100644
index f0661f2..0000000
--- a/pi/prowlarr/docker-compose.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-services:
-  prowlarr:
-    image: lscr.io/linuxserver/prowlarr:latest
-    container_name: prowlarr
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/New_York
-
-    volumes:
-      - prowlarr_data:/config
-
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.prowlarr.loadbalancer.server.port=9696"
-    
-    networks:
-      - web
-
-networks:
-  web:
-    external: true
-
-volumes:
-  prowlarr_data:
-    external: true
-
diff --git a/pi/radarr/docker-compose.yml b/pi/radarr/docker-compose.yml
deleted file mode 100644
index fd0cc5f..0000000
--- a/pi/radarr/docker-compose.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-services:
-  radarr:
-    image: lscr.io/linuxserver/radarr:latest
-    container_name: radarr
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/New_York
-
-    volumes:
-      - radarr_data:/config
-      - nfs-media-movies:/movies
-      - nfs-media-standup:/standup
-      - nfs-downloads:/downloads
-
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.radarr.loadbalancer.server.port=7878"
-      - 'traefik.http.routers.radarr.middlewares=authelia@docker'
-
-    networks:
-      - web
-
-networks:
-  web:
-    external: true
-
-volumes:
-  radarr_data:
-    external: true
-
-  nfs-downloads:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/downloads"
-
-  nfs-media-movies:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/Media/Movies"
-
-  nfs-media-standup:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/Media/Stand-Up Specials"
diff --git a/pi/sabnzbd/docker-compose.yml b/pi/sabnzbd/docker-compose.yml
deleted file mode 100644
index e414b1e..0000000
--- a/pi/sabnzbd/docker-compose.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-services:
-  sabnzbd:
-    image: lscr.io/linuxserver/sabnzbd:latest
-    container_name: sabnzbd
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/New_York
-
-    volumes:
-      - sabnzbd_data:/config
-      - nfs-downloads:/downloads
-      - nfs-downloads-incomplete:/incomplete
-
-
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.sabnzbd.loadbalancer.server.port=8080"
-      - 'traefik.http.routers.sabnzbd.middlewares=authelia@docker'
-
-    networks:
-      - web
-
-networks:
-  web:
-    external: true
-
-volumes:
-  sabnzbd_data:
-    external: true
-
-  nfs-downloads:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/downloads"
-
-  nfs-downloads-incomplete:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/downloads/incomplete"
-
diff --git a/pi/sonarr/docker-compose.yml b/pi/sonarr/docker-compose.yml
deleted file mode 100644
index eaabf03..0000000
--- a/pi/sonarr/docker-compose.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-services:
-  sonarr:
-    image: lscr.io/linuxserver/sonarr:latest
-    container_name: sonarr
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/New_York
-
-    volumes:
-      - sonarr_data:/config
-      - nfs-downloads:/downloads
-      - nfs-media-tv:/tv
-
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.bitwarden.loadbalancer.server.port=8989"
-      - 'traefik.http.routers.bitwarden.middlewares=authelia@docker'
-    
-    networks:
-      - web
-
-networks:
-  web:
-    external: true
-
-volumes:
-  sonarr_data:
-    external: true
-
-  nfs-downloads:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/downloads"
-
-  nfs-media-tv:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.145,nolock,soft,rw
-      device: ":/volume1/Media/TV"
-
-