diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh
index 2fd49096761723613e407a2454ffe23388f6a541..31df3047e249f95de65cae00ec006ce0f81723f1 100755
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
@@ -77,10 +77,12 @@ echo $SRC
 # Clean unused UI modules
 rm -Rf node_modules/duniter-ui/node_modules
 
-# Because we are building in a VM, Node.js could not detect that the target is ARM. So we move the modules' binaries accordingly.
-#mv node_modules/naclb/lib/binding/Release/node-v48-linux-x64 node_modules/naclb/lib/binding/Release/node-v48-linux-arm
-#mv node_modules/wotb/lib/binding/Release/node-v48-linux-x64 node_modules/wotb/lib/binding/Release/node-v48-linux-arm
-#mv node_modules/sqlite3/lib/binding/Release/node-v48-linux-x64 node_modules/sqlite3/lib/binding/Release/node-v48-linux-arm
+# Remove non production folders
+rm -rf coverage test
+
+# Remove unused duniteroxyde intermediate binaries
+rm -rf node_modules/duniteroxyde/target
+rm -rf node_modules/duniteroxyde/native/target
 
 cd ..
 mkdir -p duniter_release
diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh
index 84ef27abd0eb4773936e62c54ab46d80fce94648..632064cd70bdd5e9a8750ee81c9b669f7747c9b8 100644
--- a/release/arch/linux/build-lin.sh
+++ b/release/arch/linux/build-lin.sh
@@ -187,7 +187,13 @@ yarn --production || exit 1
 # Patch leveldown
 cp "${ROOT}/release/resources/leveldown-fix.json" "${RELEASES}/duniter/node_modules/leveldown/package.json" || exit 1
 
-rm -rf release coverage # Non production folders
+# Remove non production folders
+rm -rf coverage release test
+
+# Remove unused duniteroxyde intermediate binaries
+rm -rf node_modules/duniteroxyde/target
+rm -rf node_modules/duniteroxyde/native/target
+
 cp -r "${RELEASES}/duniter" "${RELEASES}/desktop_" || exit 1
 cp -r "${RELEASES}/duniter" "${RELEASES}/server_" || exit 1
 
diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile
index 6b0b0607a9466f1e9f472b54973ca9c27f5d1c0e..3b8cd3098a3535fdc95df6cb484c8c0244b27480 100644
--- a/release/docker/Dockerfile
+++ b/release/docker/Dockerfile
@@ -26,7 +26,10 @@ RUN export PATH="$HOME/.cargo/bin:$PATH" && \
    export RUSTFLAGS="-C target-feature=-crt-static" && \
    yarn install --production && \
    yarn add duniter-ui@${DUNITER_UI_VER} && \
-	rm -rf test
+   mv release/docker/duniter.sh docker.sh && \
+   rm -rf coverage release test && \
+   rm -rf node_modules/duniteroxyde/target && \
+   rm -rf node_modules/duniteroxyde/native/target
 
 # ------------------------------------------------------------------------------
 # Final Stage
@@ -43,7 +46,7 @@ RUN mkdir -p /var/lib/duniter /etc/duniter && chown duniter:duniter /var/lib/dun
 COPY --from=build --chown=duniter:duniter . /duniter/duniter
 
 # copy bootstrap script
-RUN cp /duniter/duniter/release/docker/duniter.sh /usr/bin/duniter && \
+RUN cp /duniter/duniter/docker.sh /usr/bin/duniter && \
    chmod +x /usr/bin/duniter && \
    chown duniter:duniter /usr/bin/duniter