diff --git a/infrastructure.org b/infrastructure.org
index b4c041d..f334e6a 100644
--- a/infrastructure.org
+++ b/infrastructure.org
@@ -860,14 +860,28 @@ include:
       - services/portainer.yaml
       - services/guacamole.yaml
       - services/guacd.yaml
+      - services/unpackerr.yaml
+      - services/bazarr.yaml
+      - services/flaresolverr.yaml
+      - services/jellyfin.yaml
+      - services/jellyseerr.yaml
+      - services/lazylibrarian.yaml
+      - services/lidarr.yaml
+      - services/mylar.yaml
+      - services/prowlarr.yaml
+      - services/qbittorrent.yaml
+      - services/radarr.yaml
+      - services/sabnzbd.yaml
+      - services/sonarr.yaml
+      - services/stash.yaml
+      - services/tdarr.yaml
+      - services/tdarr-node.yaml
+      - services/tubearchivist.yaml
+      - services/audiobookshelf.yaml
+      - services/whisparr.yaml
 #+END_SRC
 
-All 25 infrastructure services in the main compose. Media services
-(jellyfin, *arr, tubearchivist, etc.) live in =mediastack/= with their
-own compose file and are managed independently via:
-#+BEGIN_SRC bash
-cd /docker/compose/mediastack && docker compose up -d
-#+END_SRC
+All 44 services are organized alphabetically by category in the include list.
 The order matters for startup dependencies: infrastructure services (gluetun,
 postgresql, valkey, authentik, traefik) come first.
 
@@ -1188,36 +1202,6 @@ services:
 
 ** Tube Archivist — YouTube Archiving
 
-Media stack services (jellyfin, *arr, tubearchivist, etc.) have their own
-compose file at =/docker/compose/mediastack/docker-compose.yaml=:
-
-#+BEGIN_SRC yaml :tangle /docker/compose/mediastack/docker-compose.yaml
-networks:
-  networking:
-    name: networking
-    external: true
-
-include:
-      - services/audiobookshelf.yaml
-      - services/bazarr.yaml
-      - services/flaresolverr.yaml
-      - services/jellyfin.yaml
-      - services/jellyseerr.yaml
-      - services/lazylibrarian.yaml
-      - services/lidarr.yaml
-      - services/mylar.yaml
-      - services/prowlarr.yaml
-      - services/qbittorrent.yaml
-      - services/radarr.yaml
-      - services/sabnzbd.yaml
-      - services/sonarr.yaml
-      - services/stash.yaml
-      - services/tdarr.yaml
-      - services/tdarr-node.yaml
-      - services/tubearchivist.yaml
-      - services/unpackerr.yaml
-      - services/whisparr.yaml
-
 Tube Archivist downloads and indexes YouTube channels, playlists, and
 videos. It provides full-text search, metadata browsing, and automatic
 subscription updates via a web UI. The stack has three containers:
@@ -1228,7 +1212,7 @@ subscription updates via a web UI. The stack has three containers:
 
 Tube Archivist does NOT need VPN routing (it reaches YouTube directly).
 
-#+BEGIN_SRC yaml :tangle /docker/compose/mediastack/services/tubearchivist.yaml
+#+BEGIN_SRC yaml :tangle /docker/compose/services/tubearchivist.yaml
 services:
   tubearchivist:
     image: bbilly1/tubearchivist:latest