diff --git a/media/.env b/media/.env
new file mode 100755
index 0000000..b70245b
--- /dev/null
+++ b/media/.env
@@ -0,0 +1,15 @@
+#GLOBAL SETTINGS
+COMPOSE_HTTP_TIMEOUT=120
+COMPOSE_IGNORE_ORPHANS=1
+DOCKER_CONFIGS=.
+DOCKERGID=999
+DOCKERHOSTNAME=DockerServer
+DOCKERLOGGING_MAXFILE=10
+DOCKERLOGGING_MAXSIZE=200k
+PGID=1000
+PUID=1000
+UMASK=000
+TZ=America/Chicago
+BACKUP_DIR=/mnt/backups
+MEDIA_DIR=/mnt/media
+STORAGE_DIR=/mnt/storage
diff --git a/media/compose.yml b/media/compose.yml
new file mode 100644
index 0000000..f36c60e
--- /dev/null
+++ b/media/compose.yml
@@ -0,0 +1,149 @@
+services:
+  bazarr:
+    container_name: bazarr
+    image: lscr.io/linuxserver/bazarr:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 6767:6767
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/bazarr:/config
+      - ${MEDIA_DIR}:/media
+
+  flaresolverr:
+    container_name: flaresolverr
+    image: ghcr.io/flaresolverr/flaresolverr:latest
+    environment:
+      - LOG_LEVEL=info
+      - LOG_HTML=false
+      - CAPTCHA_SOLVER=none
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 9191:8191
+    restart: always
+
+  jackett:
+    container_name: jackett
+    image: lscr.io/linuxserver/jackett:latest
+    environment:
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - TZ=${TZ}
+      - UMASK=${UMASK}
+      - AUTO_UPDATE=true
+    networks:
+      - reverse-proxy
+    ports:
+      - 9117:9117
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/jackett/config:/config
+      - ${MEDIA_DIR}/downloads/torrents:/torrents
+
+  lidarr:
+    container_name: lidarr
+    image: lscr.io/linuxserver/lidarr:latest
+    environment:
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 8686:8686
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/lidarr/config:/config
+      - ${MEDIA_DIR}:/media
+      - ${STORAGE_DIR}//Music/Albums:/music
+
+  nzbhydra:
+    container_name: nzbhydra
+    image: lscr.io/linuxserver/nzbhydra2:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 5076:5076
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/nzbhydra/config:/config
+      - ${MEDIA_DIR}/downloads/nzbs:/nzbs
+      - ${MEDIA_DIR}/downloads/torrents:/torrents
+
+  prowlarr:
+    container_name: prowlarr
+    image: ghcr.io/linuxserver/prowlarr:develop
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 9696:9696
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/prowlarr/config:/config
+
+  radarr:
+    container_name: radarr
+    image: lscr.io/linuxserver/radarr:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 7878:7878
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/radarr:/config
+      - ${MEDIA_DIR}:/media
+
+  sonarr:
+    container_name: sonarr
+    image: lscr.io/linuxserver/sonarr:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 8989:8989
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/sonarr:/config
+      - ${MEDIA_DIR}:/media
+
+  speedtest-tracker:
+    container_name: speedtest-tracker
+    image: lscr.io/linuxserver/speedtest-tracker:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - DB_CONNECTION=sqlite
+    networks:
+      - reverse-proxy
+    ports:
+      - 8765:80
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/speedtesttracker/config:/config
+
+networks:
+  reverse-proxy:
+    name: reverse-proxy
+    external: true
diff --git a/vpn/compose.yml b/vpn/compose.yml
index 184e111..86cff77 100755
--- a/vpn/compose.yml
+++ b/vpn/compose.yml
@@ -1,20 +1,4 @@
 services:
-  bazarr:
-    container_name: bazarr
-    image: lscr.io/linuxserver/bazarr:latest
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 6767:6767
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/bazarr:/config
-      - ${MEDIA_DIR}:/media
-
   # debian-xfce-firefox:
   #   container_name: debian-xfce-firefox
   #   image: repo.aknlw.com/akanealw/debian-vnc-xfce:latest-firefox-default
@@ -47,20 +31,6 @@ services:
     volumes:
       - ${DOCKER_CONFIGS}/firefox/config:/config
 
-  flaresolverr:
-    container_name: flaresolverr
-    image: ghcr.io/flaresolverr/flaresolverr:latest
-    environment:
-      - LOG_LEVEL=info
-      - LOG_HTML=false
-      - CAPTCHA_SOLVER=none
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 9191:8191
-    restart: always
-
   gluetun:
     container_name: gluetun    
     image: qmcgaw/gluetun:v3.34
@@ -79,11 +49,13 @@ services:
       - NET_ADMIN
     devices:
       - /dev/net/tun:/dev/net/tun
+    networks:
+      - reverse-proxy
     ports:
       - 8777:8000 # http control
       - 8888:8888 # http proxy
       # - 6901:6901 # debian xfce firefox
-      - 3100:3000 # firefox http
+      # - 3100:3000 # firefox http
       - 3101:3001 # firefox https
       - 3129:3129 # jdownloader
       - 5800:5800 # jdownloader]
@@ -93,24 +65,6 @@ services:
     volumes:
       - ${DOCKER_CONFIGS}/gluetun:/gluetun
 
-  jackett:
-    container_name: jackett
-    image: lscr.io/linuxserver/jackett:latest
-    environment:
-      - PGID=${PGID}
-      - PUID=${PUID}
-      - TZ=${TZ}
-      - UMASK=${UMASK}
-      - AUTO_UPDATE=true
-    networks:
-      - reverse-proxy
-    ports:
-      - 9117:9117
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/jackett/config:/config
-      - ${MEDIA_DIR}/downloads/torrents:/torrents
-
   jdownloader:
     container_name: jdownloader
     image: jlesage/jdownloader-2:latest
@@ -134,55 +88,6 @@ services:
       - ${MEDIA_DIR}/downloads/jdownloader:/output
       - /etc/localtime:/etc/localtime:ro
 
-  lidarr:
-    container_name: lidarr
-    image: lscr.io/linuxserver/lidarr:latest
-    environment:
-      - PGID=${PGID}
-      - PUID=${PUID}
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 8686:8686
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/lidarr/config:/config
-      - ${MEDIA_DIR}:/media
-      - ${STORAGE_DIR}//Music/Albums:/music
-
-  nzbhydra:
-    container_name: nzbhydra
-    image: lscr.io/linuxserver/nzbhydra2:latest
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 5076:5076
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/nzbhydra/config:/config
-      - ${MEDIA_DIR}/downloads/nzbs:/nzbs
-      - ${MEDIA_DIR}/downloads/torrents:/torrents
-
-  prowlarr:
-    container_name: prowlarr
-    image: ghcr.io/linuxserver/prowlarr:develop
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 9696:9696
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/prowlarr/config:/config
-
   qbittorrent:
     container_name: qbittorrent
     image: lscr.io/linuxserver/qbittorrent:latest
@@ -200,22 +105,6 @@ services:
       - ${MEDIA_DIR}:/media
       - ${MEDIA_DIR}/downloads/torrents:/torrents
 
-  radarr:
-    container_name: radarr
-    image: lscr.io/linuxserver/radarr:latest
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 7878:7878
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/radarr:/config
-      - ${MEDIA_DIR}:/media
-
   sabnzbd:
     container_name: sabnzbd
     image: lscr.io/linuxserver/sabnzbd:latest
@@ -232,42 +121,10 @@ services:
       - ${MEDIA_DIR}:/media
       - ${MEDIA_DIR}/downloads/nzbs:/nzbs    
 
-  sonarr:
-    container_name: sonarr
-    image: lscr.io/linuxserver/sonarr:latest
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    networks:
-      - reverse-proxy
-    ports:
-      - 8989:8989
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/sonarr:/config
-      - ${MEDIA_DIR}:/media
-
-  speedtest-tracker:
-    container_name: speedtest-tracker
-    image: lscr.io/linuxserver/speedtest-tracker:latest
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - DB_CONNECTION=sqlite
-    networks:
-      - reverse-proxy
-    ports:
-      - 8765:80
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/speedtesttracker/config:/config
-
 networks:
-  vpn:
   reverse-proxy:
     name: reverse-proxy
     external: true
 
-volumes:
-  debian-xfce-firefox:
+# volumes:
+#   debian-xfce-firefox: