diff --git a/.gitignore b/.gitignore
index 8f8f419..4b2a2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,11 +28,11 @@ Thumbs.db
 *.swp
 *.swo
 
-# Dati locali (bind mount Docker)
-data/
-
-# Uploads generati a runtime (volume Docker)
-app/public/uploads/
+# Dati locali (bind mount Docker) — ignora contenuto, traccia solo struttura
+data/db/
+data/caddy/
+data/uploads/*
+!data/uploads/.gitkeep
 
 # Backup
 backups/
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d21ee7..e1da118 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     expose:
       - "3000"
     volumes:
-      - uploads:/app/public/uploads
+      - ./data/uploads:/app/public/uploads
 
   mailpit:
     image: axllent/mailpit:latest
@@ -46,7 +46,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
       - ./data/caddy/data:/data
       - ./data/caddy/config:/config
-      - uploads:/srv/uploads
+      - ./data/uploads:/srv/uploads
     depends_on:
       - app
 
@@ -59,5 +59,3 @@ services:
     profiles:
       - dev
 
-volumes:
-  uploads: