diff --git a/docker/photoprism/arm64/docker-compose.yml b/docker/photoprism/arm64/docker-compose.yml
index 5abe7b025..a683b2620 100644
--- a/docker/photoprism/arm64/docker-compose.yml
+++ b/docker/photoprism/arm64/docker-compose.yml
@@ -53,11 +53,13 @@ services:
       PHOTOPRISM_JPEG_SIZE: 7680                     # Size limit for converted image files in pixels (720-30000)
       PHOTOPRISM_JPEG_QUALITY: 92                    # Set to 95 for high-quality thumbnails (25-100)
       PHOTOPRISM_DARKTABLE_PRESETS: "false"          # Use darktable presets (disables concurrent raw to jpeg conversion)
-      PHOTOPRISM_STORAGE_PATH: "/photoprism/storage" # Storage PATH for cache, settings and SQLite database
     volumes:
-      - "/photoprism/storage"                        # Keep cache and settings when upgrading or restarting
-      - "~/Pictures/Originals:/photoprism/originals" # [local path]:[container path]
-      - "~/Pictures/Import:/photoprism/import"       # [local path]:[container path] (optional)
+      - "~/Pictures:/photoprism/originals"           # [local path]:[container path]
+      # Multiple folders can be indexed by mounting them as subfolders of /photoprism/originals:
+      # - "~/Family:/photoprism/originals/Family"    # [folder_1]:/photoprism/originals/[folder_1]
+      # - "~/Friends:/photoprism/originals/Friends"  # [folder_2]:/photoprism/originals/[folder_2]
+      - "~/PhotoPrism/Storage:/photoprism/storage"   # Settings, index, sidecar files, and generated thumbnails
+      - "~/PhotoPrism/Import:/photoprism/import"     # Mounting the import folder is optional (see docs)
 
 # Uncomment the following lines to use MariaDB instead of SQLite for improved performance & scalability:
 #
diff --git a/docker/photoprism/docker-compose.yml b/docker/photoprism/docker-compose.yml
index 86bd54256..b9adc5f86 100644
--- a/docker/photoprism/docker-compose.yml
+++ b/docker/photoprism/docker-compose.yml
@@ -53,11 +53,13 @@ services:
       PHOTOPRISM_JPEG_SIZE: 7680                     # Size limit for converted image files in pixels (720-30000)
       PHOTOPRISM_JPEG_QUALITY: 92                    # Set to 95 for high-quality thumbnails (25-100)
       PHOTOPRISM_DARKTABLE_PRESETS: "false"          # Use darktable presets (disables concurrent raw to jpeg conversion)
-      PHOTOPRISM_STORAGE_PATH: "/photoprism/storage" # Storage PATH for cache, settings and SQLite database
     volumes:
-      - "/photoprism/storage"                        # Keep cache and settings when upgrading or restarting
-      - "~/Pictures/Originals:/photoprism/originals" # [local path]:[container path]
-      - "~/Pictures/Import:/photoprism/import"       # [local path]:[container path] (optional)
+      - "~/Pictures:/photoprism/originals"           # [local path]:[container path]
+      # Multiple folders can be indexed by mounting them as subfolders of /photoprism/originals:
+      # - "~/Family:/photoprism/originals/Family"    # [folder_1]:/photoprism/originals/[folder_1]
+      # - "~/Friends:/photoprism/originals/Friends"  # [folder_2]:/photoprism/originals/[folder_2]
+      - "~/PhotoPrism/Storage:/photoprism/storage"   # Settings, index, sidecar files, and generated thumbnails
+      - "~/PhotoPrism/Import:/photoprism/import"     # Mounting the import folder is optional (see docs)
 
 # Uncomment the following lines to use MariaDB instead of SQLite for improved performance & scalability:
 #