diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 050af753..d0033689 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -69,7 +69,7 @@ jobs:
         # Clear some space (https://github.com/actions/runner-images/issues/2840)
         sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/share/boost
 
-        DOCKER_BUILDKIT=1 docker buildx build --load -f Dockerfile-${{ matrix.arch }} \
+        DOCKER_BUILDKIT=1 docker buildx build --load -f Dockerfile \
           --platform=$DOCKER_PLATFORM \
           --build-arg PIP_VERSION=$PIP_VERSION \
           --build-arg BUILDKIT_INLINE_CACHE=1 \
diff --git a/Dockerfile-amd64 b/Dockerfile
similarity index 91%
rename from Dockerfile-amd64
rename to Dockerfile
index 3abd7a1f..d7bc6848 100644
--- a/Dockerfile-amd64
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:experimental
-FROM quay.io/unstructured-io/base-images:wolfi-base@sha256:7c3af225a39f730f4feee705df6cd8d1570739dc130456cf589ac53347da0f1d as base
+FROM quay.io/unstructured-io/base-images:wolfi-base-e48da6b@sha256:8ad3479e5dc87a86e4794350cca6385c01c6d110902c5b292d1a62e231be711b as base
 
 # NOTE(crag): NB_USER ARG for mybinder.org compat:
 #             https://mybinder.readthedocs.io/en/latest/tutorials/dockerfile.html
diff --git a/Dockerfile-arm64 b/docker/rockylinux-9.4/Dockerfile
similarity index 100%
rename from Dockerfile-arm64
rename to docker/rockylinux-9.4/Dockerfile
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
index 6ab99bb4..089cb8a4 100755
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@@ -10,7 +10,7 @@ DOCKER_PLATFORM="${DOCKER_PLATFORM:-}"
 
 
 DOCKER_BUILD_CMD=(
-  docker buildx build --load -f Dockerfile-amd64
+  docker buildx build --load -f Dockerfile
   --build-arg PIP_VERSION="$PIP_VERSION"
   --build-arg BUILDKIT_INLINE_CACHE=1
   --build-arg PIPELINE_PACKAGE="$PIPELINE_PACKAGE"