diff --git a/templates/immich/docker-compose.yml b/templates/immich/docker-compose.yml
index 6668595..f5db61f 100644
--- a/templates/immich/docker-compose.yml
+++ b/templates/immich/docker-compose.yml
@@ -9,7 +9,7 @@
 #   DB_PASSWORD     - PostgreSQL password (auto-generated)
 #
 # Storage layout:
-#   User photos/videos → ${HDD_PATH}/storage/immich  (HDD, host path)
+#   User photos/videos → ${HDD_PATH}/appdata/immich  (HDD, host path)
 #   PostgreSQL data    → immich_postgres_data          (named volume, NVMe)
 #   ML model cache     → immich_ml_cache               (named volume, NVMe)
 #   Redis data         → immich_redis_data             (named volume, NVMe)
@@ -36,7 +36,7 @@ services:
       - IMMICH_MACHINE_LEARNING_URL=http://immich-machine-learning:3003
       - TZ=Europe/Budapest
     volumes:
-      - ${HDD_PATH}/storage/immich:/usr/src/app/upload
+      - ${HDD_PATH}/appdata/immich:/usr/src/app/upload
     networks:
       - traefik-public
       - immich-internal
diff --git a/templates/nextcloud/docker-compose.yml b/templates/nextcloud/docker-compose.yml
index 4236ad2..06cd958 100644
--- a/templates/nextcloud/docker-compose.yml
+++ b/templates/nextcloud/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       - REDIS_HOST=nextcloud-redis
     volumes:
       - nextcloud_html:/var/www/html
-      - ${HDD_PATH}/storage/nextcloud:/var/www/html/data
+      - ${HDD_PATH}/appdata/nextcloud:/var/www/html/data
     networks:
       - traefik-public
       - nextcloud-internal
diff --git a/templates/paperless-ngx/docker-compose.yml b/templates/paperless-ngx/docker-compose.yml
index 18ad545..5747eea 100644
--- a/templates/paperless-ngx/docker-compose.yml
+++ b/templates/paperless-ngx/docker-compose.yml
@@ -12,9 +12,9 @@
 #   PAPERLESS_ADMIN_PASSWORD - Initial admin password
 #
 # Storage layout:
-#   Consume folder   → ${HDD_PATH}/storage/paperless/consume   (HDD, drop files here)
-#   Document media   → ${HDD_PATH}/storage/paperless/media      (HDD, originals + archive)
-#   Export folder    → ${HDD_PATH}/storage/paperless/export     (HDD, for backups)
+#   Consume folder   → ${HDD_PATH}/appdata/paperless/consume   (HDD, drop files here)
+#   Document media   → ${HDD_PATH}/appdata/paperless/media      (HDD, originals + archive)
+#   Export folder    → ${HDD_PATH}/appdata/paperless/export     (HDD, for backups)
 #   App data/index   → paperless_data                            (named volume, NVMe)
 #   PostgreSQL data  → paperless_postgres_data                   (named volume, NVMe)
 #   Redis data       → paperless_redis_data                      (named volume, NVMe)
@@ -54,9 +54,9 @@ services:
       - TZ=Europe/Budapest
     volumes:
       - paperless_data:/usr/src/paperless/data
-      - ${HDD_PATH}/storage/paperless/media:/usr/src/paperless/media
-      - ${HDD_PATH}/storage/paperless/consume:/usr/src/paperless/consume
-      - ${HDD_PATH}/storage/paperless/export:/usr/src/paperless/export
+      - ${HDD_PATH}/appdata/paperless/media:/usr/src/paperless/media
+      - ${HDD_PATH}/appdata/paperless/consume:/usr/src/paperless/consume
+      - ${HDD_PATH}/appdata/paperless/export:/usr/src/paperless/export
     networks:
       - traefik-public
       - paperless-internal
diff --git a/templates/romm/docker-compose.yml b/templates/romm/docker-compose.yml
index 472f2c2..8a5d3c4 100644
--- a/templates/romm/docker-compose.yml
+++ b/templates/romm/docker-compose.yml
@@ -11,8 +11,8 @@
 #   ROMM_AUTH_SECRET_KEY    - Auth secret (auto-generated)
 #
 # Storage layout:
-#   ROM library    → ${HDD_PATH}/storage/romm/library     (HDD, host path)
-#   Cover art etc  → ${HDD_PATH}/storage/romm/resources   (HDD, host path)
+#   ROM library    → ${HDD_PATH}/appdata/romm/library     (HDD, host path)
+#   Cover art etc  → ${HDD_PATH}/appdata/romm/resources   (HDD, host path)
 #   App config     → romm_config                            (named volume, NVMe)
 #   MariaDB data   → romm_db_data                           (named volume, NVMe)
 #   Redis data     → romm_redis_data                        (named volume, NVMe)
@@ -62,8 +62,8 @@ services:
       - MOBYGAMES_API_KEY=${MOBYGAMES_API_KEY:-}
       - TZ=Europe/Budapest
     volumes:
-      - ${HDD_PATH}/storage/romm/library:/romm/library
-      - ${HDD_PATH}/storage/romm/resources:/romm/resources
+      - ${HDD_PATH}/appdata/romm/library:/romm/library
+      - ${HDD_PATH}/appdata/romm/resources:/romm/resources
       - romm_config:/romm/config
     networks:
       - traefik-public