diff --git a/cpp-low-level/Dockerfile b/cpp-low-level/Dockerfile
index 1a79064..e201cf4 100644
--- a/cpp-low-level/Dockerfile
+++ b/cpp-low-level/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker.io/docker/dockerfile:1
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 
 # This enforces that the packages downloaded from the repositories are the same
 # for the defined date, no matter when the image is built.
@@ -41,7 +41,7 @@ ADD https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_
 
 RUN <<EOF
 set -e
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
@@ -65,15 +65,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/cpp/Dockerfile b/cpp/Dockerfile
index 6c182ea..55df8af 100644
--- a/cpp/Dockerfile
+++ b/cpp/Dockerfile
@@ -41,7 +41,7 @@ RUN make
 # runtime stage: produces final image that will be executed
 FROM base
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -50,15 +50,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/go/Dockerfile b/go/Dockerfile
index 7434d05..48eeba4 100644
--- a/go/Dockerfile
+++ b/go/Dockerfile
@@ -65,7 +65,7 @@ RUN make
 # runtime stage: produces final image that will be executed
 FROM base-riscv64
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -74,15 +74,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/java/Dockerfile b/java/Dockerfile
index bb145dc..d619cb7 100644
--- a/java/Dockerfile
+++ b/java/Dockerfile
@@ -16,28 +16,34 @@ COPY app/src /app/app/src
 
 RUN ./gradlew --no-daemon shadowJar
 
-
 # ################################################################################
 # # Runtime stage (Cartesi-compatible: linux/riscv64)
-
 FROM --platform=linux/riscv64 eclipse-temurin:21-jre
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.0
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends wget && \
-  wget -O /tmp/tools.deb https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb && \
-  echo "973943b3a3e40164175da7d7b5b7857642d1277e1fd38be268da12daca5ff458735f93a7ac25b350b3de58b073a25b64c860d9eb92157bfc946b03dd1a345cc9 /tmp/tools.deb" | sha512sum -c && \
-  apt-get install -y /tmp/tools.deb && \
-  rm -f /tmp/tools.deb && \
-  cp -a /etc/shadow /etc/shadow- && \
-  rm -rf /var/lib/apt/lists/*
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
+ARG DEBIAN_FRONTEND=noninteractive
+RUN <<EOF
+set -e
+apt-get update
+apt-get install -y --no-install-recommends \
+  busybox-static
+
+cd /tmp
+busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
+  | sha512sum -c
+apt-get install -y --no-install-recommends \
+  /tmp/machine-guest-tools_riscv64.deb
+rm /tmp/machine-guest-tools_riscv64.deb
+
+rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
+EOF
 
 # Copy built JAR from Stage 1
 WORKDIR /opt/cartesi/dapp
 COPY --from=build /app/app/build/libs/app.jar ./app.jar
 
-
 ENV PATH="/opt/cartesi/bin:${PATH}"
 ENV ROLLUP_HTTP_SERVER_URL="http://127.0.0.1:5004"
 ENTRYPOINT ["rollup-init"]
-CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "app.jar"]
diff --git a/javascript/Dockerfile b/javascript/Dockerfile
index e1030a7..bef55dc 100644
--- a/javascript/Dockerfile
+++ b/javascript/Dockerfile
@@ -40,7 +40,7 @@ RUN yarn build
 # performance when loading the Cartesi Machine.
 FROM base
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -50,15 +50,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/lua/Dockerfile b/lua/Dockerfile
index f96832c..f2dd53d 100644
--- a/lua/Dockerfile
+++ b/lua/Dockerfile
@@ -40,7 +40,7 @@ EOF
 # riscv64 final stage
 FROM base
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -51,15 +51,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/python/Dockerfile b/python/Dockerfile
index 7ffee8f..306e0b7 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -25,7 +25,7 @@ EOF
 # performance when loading the Cartesi Machine.
 FROM base
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -34,15 +34,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/ruby/Dockerfile b/ruby/Dockerfile
index 498eda4..926834c 100644
--- a/ruby/Dockerfile
+++ b/ruby/Dockerfile
@@ -44,7 +44,7 @@ EOF
 ################################################################################
 # runtime stage: produces final image that will be executed
 FROM base
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -54,15 +54,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/rust/Dockerfile b/rust/Dockerfile
index 3aa9593..095ef2d 100644
--- a/rust/Dockerfile
+++ b/rust/Dockerfile
@@ -80,7 +80,7 @@ RUN cargo build --release
 # runtime stage: produces final image that will be executed
 FROM base-riscv64
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -89,15 +89,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
     | sha512sum -c
 apt-get install -y --no-install-recommends \
     /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF
 
diff --git a/typescript/Dockerfile b/typescript/Dockerfile
index 9f5450e..c237960 100644
--- a/typescript/Dockerfile
+++ b/typescript/Dockerfile
@@ -41,7 +41,7 @@ RUN yarn build
 # performance when loading the Cartesi Machine.
 FROM base
 
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 set -e
@@ -50,15 +50,12 @@ apt-get install -y --no-install-recommends \
 
 cd /tmp
 busybox wget https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb
-echo "96625d97354c1cc905a8630f3d715f64b14bc5b89f3e30913d2eb02da3a01f20a7784d32c2ed340ca401dce4d1bc0e6bebfc3fbb3808725225c5793b16fa6ef4 /tmp/machine-guest-tools_riscv64.deb" \
+echo "4af9911a5a76738d526bfc2b5462cf96c9dee98ec8b23f3ca91ac4849d5761765f471b5e2e8779809bc4a26d2799f8e744622864fa549ada5941e21d999ff4be /tmp/machine-guest-tools_riscv64.deb" \
   | sha512sum -c
 apt-get install -y --no-install-recommends \
   /tmp/machine-guest-tools_riscv64.deb
 rm /tmp/machine-guest-tools_riscv64.deb
 
-# Fix non-determinism issue when installing machine-guest-tools
-cp -a /etc/shadow /etc/shadow-
-
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/*
 EOF