diff --git a/Dockerfile b/Dockerfile
index 0c67b544..a88dabfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,5 +7,3 @@ RUN pacman -Syyu git --noconfirm
 RUN pacman -Syyu python-pip --noconfirm
 RUN pacman -Syyu python-crcmod --noconfirm
 WORKDIR /app
-COPY . .
-RUN git submodule update --init --recursive
\ No newline at end of file
diff --git a/compile-with-docker.bat b/compile-with-docker.bat
index 8c3cf90c..ed33d31f 100644
--- a/compile-with-docker.bat
+++ b/compile-with-docker.bat
@@ -1,4 +1,4 @@
 @echo off
 docker build -t uvk5 .
-docker run --rm -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp f4hwn* compiled-firmware/"
-pause
\ No newline at end of file
+docker run --rm -v %CD%:/app uvk5 /bin/bash -c "cd /app && git submodule update --init --recursive && make -s clean && make -s"
+pause
diff --git a/compile-with-docker.sh b/compile-with-docker.sh
index 9135af11..3fe763d8 100755
--- a/compile-with-docker.sh
+++ b/compile-with-docker.sh
@@ -22,30 +22,32 @@ fi
 
 custom() {
     echo "🔧 Custom compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        rm -f ./compiled-firmware/* && cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         EDITION_STRING=Custom \
         TARGET=f4hwn.custom \
-        && cp f4hwn.custom* compiled-firmware/"
+        && mv f4hwn.custom* compiled-firmware/ \
+        && make -s clean"
 }
 
 standard() {
     echo "📦 Standard compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        rm -f ./compiled-firmware/* && cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         ENABLE_SPECTRUM=0 \
         ENABLE_FMRADIO=0 \
         ENABLE_AIRCOPY=0 \
         ENABLE_NOAA=0 \
         EDITION_STRING=Standard \
         TARGET=f4hwn.standard \
-        && cp f4hwn.standard* compiled-firmware/"
+        && mv f4hwn.standard* compiled-firmware/ \
+        && make -s clean"
 }
 
 bandscope() {
     echo "📺 Bandscope compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        rm -f ./compiled-firmware/* && cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         ENABLE_SPECTRUM=1 \
         ENABLE_FMRADIO=0 \
         ENABLE_VOX=0 \
@@ -57,13 +59,14 @@ bandscope() {
         ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         EDITION_STRING=Bandscope \
         TARGET=f4hwn.bandscope \
-        && cp f4hwn.bandscope* compiled-firmware/"
+        && mv f4hwn.bandscope* compiled-firmware/ \
+        && make -s clean"
 }
 
 broadcast() {
     echo "📻 Broadcast compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         ENABLE_SPECTRUM=0 \
         ENABLE_FMRADIO=1 \
         ENABLE_VOX=1 \
@@ -75,13 +78,14 @@ broadcast() {
         ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         EDITION_STRING=Broadcast \
         TARGET=f4hwn.broadcast \
-        && cp f4hwn.broadcast* compiled-firmware/"
+        && mv f4hwn.broadcast* compiled-firmware/ \
+        && make -s clean"
 }
 
 basic() {
     echo "☘️ Basic compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         ENABLE_SPECTRUM=1 \
         ENABLE_FMRADIO=1 \
         ENABLE_VOX=0 \
@@ -100,13 +104,14 @@ basic() {
         ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         EDITION_STRING=Basic \
         TARGET=f4hwn.basic \
-        && cp f4hwn.basic* compiled-firmware/"
+        && mv f4hwn.basic* compiled-firmware/ \
+        && make -s clean"
 }
 
 rescueops() {
     echo "🚨 RescueOps compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         ENABLE_SPECTRUM=0 \
         ENABLE_FMRADIO=0 \
         ENABLE_VOX=1 \
@@ -118,13 +123,14 @@ rescueops() {
         ENABLE_FEAT_F4HWN_RESCUE_OPS=1 \
         EDITION_STRING=RescueOps \
         TARGET=f4hwn.rescueops \
-        && cp f4hwn.rescueops* compiled-firmware/"
+        && mv f4hwn.rescueops* compiled-firmware/ \
+        && make -s clean"
 }
 
 game() {
     echo "🎮 Game compilation..."
-    docker run --rm -v "$FIRMWARE_DIR:/app/compiled-firmware" "$IMAGE_NAME" /bin/bash -c "\
-        cd /app && make -s \
+    docker run --rm -v "${PWD}:/app" --user $(id -u):$(id -g) "$IMAGE_NAME" /bin/bash -c "\
+        cd /app && git submodule update --init --recursive && make -s clean && make -s \
         ENABLE_SPECTRUM=0 \
         ENABLE_FMRADIO=1 \
         ENABLE_VOX=0 \
@@ -136,7 +142,8 @@ game() {
         ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         EDITION_STRING=Game \
         TARGET=f4hwn.game \
-        && cp f4hwn.game* compiled-firmware/"
+        && mv f4hwn.game* compiled-firmware/ \
+        && make -s clean"
 }
 
 # ------------------ MENU ------------------