diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77f7059..72e45c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for Linux/ARM64 images
 - Added support fot the GitHub registry
 - Added support for building multiple toolchains (RV64G and RV64IMA)
+- Added xgenext2fs to image
 
 ### Changed
 - Changed base image from Ubuntu 22.04 to Debian Bookworm
diff --git a/Dockerfile b/Dockerfile
index d4dd38c..bf7ab28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,7 @@ LABEL maintainer="Machine Reference Unit <https://discord.com/channels/600597137
 
 ARG KERNEL_VERSION # define on makefile or CI
 ARG TOOLCHAIN_CONFIG=configs/ct-ng-config
+ARG TARGETARCH
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -33,10 +34,21 @@ RUN \
         build-essential autoconf automake libtool libtool-bin autotools-dev \
         git make pkg-config patchutils gawk bison flex ca-certificates gnupg \
         device-tree-compiler libmpc-dev libmpfr-dev libgmp-dev rsync cpio \
-        libusb-1.0-0-dev texinfo gperf bc zlib1g-dev libncurses-dev genext2fs \
+        libusb-1.0-0-dev texinfo gperf bc zlib1g-dev libncurses-dev \
         wget vim wget curl zip unzip libexpat-dev python3 help2man && \
     rm -rf /var/lib/apt/lists/*
 
+RUN \
+    wget -O /tmp/xgenext2fs.deb https://github.com/cartesi/genext2fs/releases/download/v1.15.3/xgenext2fs_${TARGETARCH}.deb && \
+    case ${TARGETARCH} in \
+      amd64) echo "f34bc34253209f6c024b97723eac7573eccb7ab62034d3d99e60df438c3458a5  /tmp/xgenext2fs.deb" | sha256sum --check ;; \
+      arm64) echo "9e6cee8e9e9e8bb5b0c51f666b848ea7a1a97e663058dcdb37a17bde76ad221a  /tmp/xgenext2fs.deb" | sha256sum --check ;; \
+    esac && \
+    apt-get update && \
+    apt-get install --no-install-recommends -y \
+      /tmp/xgenext2fs.deb && \
+    rm -rf /var/lib/apt/lists/*
+
 RUN \
     adduser developer -u 499 --gecos ",,," --disabled-password && \
     mkdir -m 775 -p $BASE $BUILD_BASE && \