diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d3ce3c1d9fc9a..335945c468c30 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -25,14 +25,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-
       - name: Install Docker BuildX
         uses: docker/setup-buildx-action@v2
         with:
+          platforms: linux/amd64,linux/arm64
           version: latest
           buildkitd-flags: --debug
 
diff --git a/Dockerfile b/Dockerfile
index e5ce88c0139ef..50f8f473f7498 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,9 +27,10 @@ RUN --mount=type=cache,target=/root/.cargo/registry --mount=type=cache,target=/r
     && strip out/chisel \
     && strip out/anvil;
 
-FROM docker.io/frolvlad/alpine-glibc:alpine-3.16_glibc-2.34 as foundry-client
+# FROM docker.io/frolvlad/alpine-glibc:alpine-3.16_glibc-2.34 as foundry-client
+FROM alpine:3.18 as foundry-client
 
-RUN apk add --no-cache linux-headers git
+RUN apk add --no-cache linux-headers git gcompat
 
 COPY --from=build-environment /opt/foundry/out/forge /usr/local/bin/forge
 COPY --from=build-environment /opt/foundry/out/cast /usr/local/bin/cast
@@ -40,13 +41,12 @@ RUN adduser -Du 1000 foundry
 
 ENTRYPOINT ["/bin/sh", "-c"]
 
-
 LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.name="Foundry" \
-      org.label-schema.description="Foundry" \
-      org.label-schema.url="https://getfoundry.sh" \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/foundry-rs/foundry.git" \
-      org.label-schema.vendor="Foundry-rs" \
-      org.label-schema.version=$VERSION \
-      org.label-schema.schema-version="1.0"
+    org.label-schema.name="Foundry" \
+    org.label-schema.description="Foundry" \
+    org.label-schema.url="https://getfoundry.sh" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url="https://github.com/foundry-rs/foundry.git" \
+    org.label-schema.vendor="Foundry-rs" \
+    org.label-schema.version=$VERSION \
+    org.label-schema.schema-version="1.0"