diff --git a/.github/workflows/bake.yaml b/.github/workflows/bake.yaml
index 6e633548..9b8d4f53 100644
--- a/.github/workflows/bake.yaml
+++ b/.github/workflows/bake.yaml
@@ -48,8 +48,6 @@ jobs:
         uses: docker/setup-qemu-action@v3
         with:
           platforms: 'arm64'
-          # TODO: remove once https://github.com/docker/setup-qemu-action/issues/198 is fixed
-          image: 'tonistiigi/binfmt:qemu-v7.0.0'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b941ce5a..64c1e896 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,8 +45,6 @@ jobs:
       uses: docker/setup-qemu-action@v3
       with:
         platforms: ${{ matrix.platforms }}
-        # TODO: remove once https://github.com/docker/setup-qemu-action/issues/198 is fixed
-        image: 'tonistiigi/binfmt:qemu-v7.0.0'
 
     - name: Docker meta
       env:
diff --git a/Debian/Dockerfile-beta.template b/Debian/Dockerfile-beta.template
index a4103d2d..b5295cd2 100644
--- a/Debian/Dockerfile-beta.template
+++ b/Debian/Dockerfile-beta.template
@@ -41,6 +41,8 @@ RUN set -xe; \
 RUN set -xe; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		# We require build-essential and python3-dev to build lz4 on arm64 since there isn't a pre-compiled wheel available
+		build-essential python3-dev \
 		python3-pip \
 		python3-psycopg2 \
 		python3-setuptools \
@@ -48,6 +50,7 @@ RUN set -xe; \
 	pip3 install %%PIP_OPTIONS%% --upgrade pip; \
 	# TODO: Remove --no-deps once https://github.com/pypa/pip/issues/9644 is solved
 	pip3 install %%PIP_OPTIONS%% --no-deps -r requirements.txt; \
+	apt-get remove -y --purge --autoremove build-essential python3-dev; \
 	rm -rf /var/lib/apt/lists/*;
 
 # Change the uid of postgres to 26
diff --git a/Debian/Dockerfile.template b/Debian/Dockerfile.template
index ed42aa4d..7803c384 100644
--- a/Debian/Dockerfile.template
+++ b/Debian/Dockerfile.template
@@ -43,6 +43,8 @@ RUN set -xe; \
 RUN set -xe; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		# We require build-essential and python3-dev to build lz4 on arm64 since there isn't a pre-compiled wheel available
+		build-essential python3-dev \
 		python3-pip \
 		python3-psycopg2 \
 		python3-setuptools \
@@ -50,6 +52,7 @@ RUN set -xe; \
 	pip3 install %%PIP_OPTIONS%% --upgrade pip; \
 	# TODO: Remove --no-deps once https://github.com/pypa/pip/issues/9644 is solved
 	pip3 install %%PIP_OPTIONS%% --no-deps -r requirements.txt; \
+	apt-get remove -y --purge --autoremove build-essential python3-dev; \
 	rm -rf /var/lib/apt/lists/*;
 
 # Change the uid of postgres to 26