diff --git a/scripts/Common/Software/docker/services/forgejo/docker-compose.base.yml b/scripts/Common/Software/docker/services/forgejo/docker-compose.base.yml
index da1056b0..05c36f0b 100644
--- a/scripts/Common/Software/docker/services/forgejo/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/forgejo/docker-compose.base.yml
@@ -32,7 +32,7 @@ services:
       MARIADB_RANDOM_ROOT_PASSWORD: "yes"
       MARIADB_AUTO_UPGRADE: "yes"
     volumes:
-      - ./database:/var/lib/mysql
+      - ./data/db:/var/lib/mysql
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
diff --git a/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml b/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml
index f70023eb..62f2320e 100644
--- a/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml
@@ -5,9 +5,9 @@ services:
     user: 1337:1337
     hostname: Jellyfin
     volumes:
-      - ./config/jellyfin:/config
+      - ./data/config/jellyfin:/config
       - cache:/cache
-      - ./media:/media
+      - ./data/media:/media
   radarr:
     image: linuxserver/radarr
     restart: unless-stopped
@@ -16,9 +16,9 @@ services:
       PGID: 1337
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - ./config/radarr:/config
-      - ./media/movies:/movies
-      - ./downloads:/downloads
+      - ./data/config/radarr:/config
+      - ./data/media/movies:/movies
+      - ./data/downloads:/downloads
   sonarr:
     image: linuxserver/sonarr
     restart: unless-stopped
@@ -27,9 +27,9 @@ services:
       PGID: 1337
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - ./config/sonarr:/config
-      - ./media/series:/tv
-      - ./downloads:/downloads
+      - ./data/config/sonarr:/config
+      - ./data/media/series:/tv
+      - ./data/downloads:/downloads
   lidarr:
     image: linuxserver/lidarr
     restart: unless-stopped
@@ -38,9 +38,9 @@ services:
       PGID: 1337
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - ./config/lidarr:/config
-      - ./media/music:/music
-      - ./downloads:/downloads
+      - ./data/config/lidarr:/config
+      - ./data/media/music:/music
+      - ./data/downloads:/downloads
   prowlarr:
     image: linuxserver/prowlarr
     restart: unless-stopped
@@ -49,7 +49,7 @@ services:
       PGID: 1337
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - ./config/prowlarr:/config
+      - ./data/config/prowlarr:/config
   flaresolverr:
     image: flaresolverr/flaresolverr
     restart: unless-stopped
@@ -79,9 +79,9 @@ services:
              --allowedpath /downloads
              --rtsocket /rtorrent/.local/share/rtorrent/rtorrent.sock
     volumes:
-      - ./config/flood:/flood
-      - ./downloads:/downloads
-      - ./config/rtorrent:/rtorrent
+      - ./data/config/flood:/flood
+      - ./data/downloads:/downloads
+      - ./data/config/rtorrent:/rtorrent
   rtorrent:
     build:
       dockerfile: ./rtorrent.Dockerfile
@@ -100,8 +100,8 @@ services:
              -o 'method.set=group.seeding.ratio.command, "d.cloase = ; d.erase = "'
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - ./config/rtorrent:/config
-      - ./downloads:/downloads
+      - ./data/config/rtorrent:/config
+      - ./data/downloads:/downloads
       - ./data/proton:/proton
     devices:
       - /dev/net/tun
diff --git a/scripts/Common/Software/docker/services/jellyfin/main.fish b/scripts/Common/Software/docker/services/jellyfin/main.fish
index 7710d69d..5972034b 100755
--- a/scripts/Common/Software/docker/services/jellyfin/main.fish
+++ b/scripts/Common/Software/docker/services/jellyfin/main.fish
@@ -66,7 +66,7 @@ begin
         URL="https://$(getServiceDomain "$domain" "")/" yq "$(getServiceKey "$service").environment.JELLYFIN_PublishedServerUrl = env(URL)" "$file" |
             sudo tee "$overrides" >/dev/null
 
-        for dir in "$root"/{downloads,config/{,jellyfin,flood,rtorrent,radarr,sonarr,lidarr,prowlarr},media/{,movies,series,music}}
+        for dir in "$root"/data/{downloads,config/{,jellyfin,flood,rtorrent,radarr,sonarr,lidarr,prowlarr},media/{,movies,series,music}}
             sudo mkdir -p "$dir"
             and chown -R $uid:$gid "$dir"
         end
diff --git a/scripts/Common/Software/docker/services/ryot/docker-compose.base.yml b/scripts/Common/Software/docker/services/ryot/docker-compose.base.yml
index 82ca2112..43ff4a06 100644
--- a/scripts/Common/Software/docker/services/ryot/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/ryot/docker-compose.base.yml
@@ -8,4 +8,4 @@ services:
     image: postgres
     restart: unless-stopped
     volumes:
-      - ./database:/var/lib/postgresql/data
+      - ./data/db:/var/lib/postgresql/data