diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 0f054d6..81a919b 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -19,6 +19,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: dhi.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: 🐋 Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
diff --git a/base/Dockerfile b/base/Dockerfile
index d69d229..fb69ee2 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,7 +1,7 @@
 ARG ALPINE_VERSION=3.21
 ARG PHP_VERSION=8.0
 
-FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv
+#FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv
 FROM ghcr.io/skpr/compass-extension:v1.10.0-php${PHP_VERSION} AS compass
 
 FROM from_image AS base
@@ -85,7 +85,7 @@ COPY --from=compass /etc/php/conf.d/00_compass.ini /etc/php/conf.d/00_compass.in
 COPY --from=compass /usr/lib/php/modules/compass.so /usr/lib/php/modules/compass.so
 
 # Built using an updated build approach in this fork: https://github.com/skpr/docconv
-COPY --from=docconv /usr/local/bin/docconv /usr/local/bin/docconv
+#COPY --from=docconv /usr/local/bin/docconv /usr/local/bin/docconv
 
 ADD conf.d/01_apcu.ini /etc/php/conf.d/01_apcu.ini
 ADD conf.d/50_overrides.ini /etc/php/conf.d/50_overrides.ini
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 390bbec..31c7b63 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -3,7 +3,7 @@ variable "PHP_VERSION" {
 }
 
 variable "ALPINE_VERSION" {
-  default = "3.21"
+  default = "3.22"
 }
 
 variable "STREAM" {
@@ -45,7 +45,7 @@ target "base" {
   context  = "base"
 
   contexts = {
-    from_image = "docker-image://docker.io/alpine:${ALPINE_VERSION}"
+    from_image = "docker-image://dhi.io/alpine-base:${ALPINE_VERSION}"
   }
 
   args = {