diff --git a/config/docker/gitea/docker-compose.yml b/config/docker/gitea/docker-compose.yml
index 8d74784..95ffb31 100644
--- a/config/docker/gitea/docker-compose.yml
+++ b/config/docker/gitea/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     networks:
       - gitea
     volumes:
-      - ./data:/data
+      - /mnt/nas/docker-data/gitea/data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
 
diff --git a/config/docker/nextcloud/docker-compose.yml b/config/docker/nextcloud/docker-compose.yml
index 8eb946d..6c18258 100644
--- a/config/docker/nextcloud/docker-compose.yml
+++ b/config/docker/nextcloud/docker-compose.yml
@@ -10,13 +10,18 @@ services:
     image: mariadb:10.11
     restart: unless-stopped
     container_name: nextcloud-db
+    user: "1024:100"  # Match NAS file ownership (uid 1024, gid 100) to bypass chown on NFS
     environment:
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/mysql_root_password
       - MYSQL_PASSWORD_FILE=/run/secrets/mysql_password
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
+      - MARIADB_INITDB_SKIP_TZINFO=1  # Skip timezone loading on NFS
     volumes:
-      - nextcloud_db:/var/lib/mysql
+      - /mnt/nas/docker-data/nextcloud/db-data:/var/lib/mysql
+    command:
+      - --innodb_use_native_aio=0  # Required for NFS
+      - --innodb_flush_method=O_DIRECT  # Better NFS performance
     networks:
       - nextcloud
     secrets:
@@ -49,7 +54,7 @@ services:
       - OVERWRITEHOST=ak-homelab.duckdns.org
       - OVERWRITEWEBROOT=/cloud
     volumes:
-      - nextcloud_data:/var/www/html
+      - /mnt/nas/docker-data/nextcloud/app-data:/var/www/html
       # External storage mounts for existing folders
       - /home/hoborg/shared:/external_storage/shared:rw
       - /home/hoborg/Documents:/external_storage/documents:rw
@@ -74,10 +79,6 @@ secrets:
   nextcloud_admin_password:
     file: /home/hoborg/creds/nextcloud_admin_password.txt
 
-volumes:
-  nextcloud_db:
-  nextcloud_data:
-
 networks:
   nextcloud:
     driver: bridge