diff --git a/.gitignore b/.gitignore
index bea7a5e..17f8dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,8 @@ lerna-debug.log*
 currentCommit.txt
 
 node_modules
-dist
+dist/*
+!dist/android/
 dist-ssr
 *.local
 
@@ -34,4 +35,5 @@ ios/
 # Build output
 output/
 *.apk
+!dist/android/*.apk
 *.aab
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e7fb019..2caf8ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,8 +76,8 @@ CMD ["bash", "-c", "\
   sed -i 's/android:configChanges=\"\\([^\"]*\\)\"/android:configChanges=\"\\1\" android:screenOrientation=\"sensorLandscape\"/g' android/app/src/main/AndroidManifest.xml && \
   bash setup-android-icons.sh && \
   cd android && ./gradlew assembleDebug --no-daemon && \
-  mkdir -p /app/output && \
-  cp app/build/outputs/apk/debug/app-debug.apk /app/output/segnapunti-debug.apk && \
+  mkdir -p /app/dist/android && \
+  cp app/build/outputs/apk/debug/app-debug.apk /app/dist/android/segnapunti-debug.apk && \
   echo '' && \
-  echo 'APK generato: /app/output/segnapunti-debug.apk'\
+  echo 'APK generato: /app/dist/android/segnapunti-debug.apk'\
 "]
diff --git a/build-apk.sh b/build-apk.sh
index b5462c5..06882ea 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -10,8 +10,8 @@ echo ""
 ARCH=$(uname -m)
 echo "Architettura rilevata: $ARCH"
 
-# Crea directory output se non esiste
-mkdir -p output
+# Crea directory dist/android se non esiste
+mkdir -p dist/android
 
 echo "Building Docker image..."
 docker build --platform linux/$(uname -m) -t segnapunti-android-builder .
@@ -19,7 +19,7 @@ docker build --platform linux/$(uname -m) -t segnapunti-android-builder .
 echo ""
 echo "Building APK inside Docker container..."
 docker run --rm \
-  -v "$(pwd)/output:/app/output" \
+  -v "$(pwd)/dist:/app/dist" \
   segnapunti-android-builder
 
 echo ""
@@ -27,10 +27,10 @@ echo "========================================="
 echo "Build completed successfully!"
 echo "========================================="
 echo ""
-echo "APK location: $(pwd)/output/segnapunti-debug.apk"
+echo "APK location: $(pwd)/dist/android/segnapunti-debug.apk"
 echo ""
 echo "Per installare su dispositivo Android:"
-echo "  adb install output/segnapunti-debug.apk"
+echo "  adb install dist/android/segnapunti-debug.apk"
 echo ""
 echo "Oppure trasferisci il file sul dispositivo"
 echo "e installalo manualmente."