diff --git a/.forgejo/actions/build-push-image/action.yaml b/.forgejo/actions/build-push-image/action.yaml
index b278e02..ac6f711 100644
--- a/.forgejo/actions/build-push-image/action.yaml
+++ b/.forgejo/actions/build-push-image/action.yaml
@@ -1,5 +1,5 @@
 name: 'Build and Push Image'
-description: 'Build a container image with Buildah and push to zot registry'
+description: 'Build a container image with Docker and push to zot registry'
 
 # TODO: Investigate zot tag immutability to prevent overwriting released versions
 # See: https://zotregistry.dev/v2.1.1/articles/immutable-tags/
@@ -26,11 +26,11 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Build image with Buildah
+    - name: Build image with Docker
       shell: bash
       run: |
         echo "Building ${{ inputs.image_name }}:${{ inputs.version }}"
-        buildah bud \
+        docker build \
           --tag ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }} \
           --tag ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }} \
           --file ${{ inputs.context }}/${{ inputs.dockerfile }} \
@@ -40,15 +40,15 @@ runs:
       shell: bash
       run: |
         echo "Pushing ${{ inputs.image_name }}:${{ inputs.version }}"
-        buildah push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}
-        buildah push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}
+        docker push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}
+        docker push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}
 
     - name: Summary
       shell: bash
       run: |
-        echo "✅ Built and pushed:"
+        echo "Built and pushed:"
         echo "   ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}"
         echo "   ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}"
         echo ""
         echo "Registry tags:"
-        curl -sf "https://${{ inputs.registry }}/v2/${{ inputs.image_name }}/tags/list" | jq -r '.tags[]' | sort -V | tail -10
+        curl -sf "https://${{ inputs.registry }}/v2/${{ inputs.image_name }}/tags/list" | jq -r '.tags[]' | sort -V | tail -10 || true
diff --git a/.forgejo/workflows/build-devpi.yaml b/.forgejo/workflows/build-devpi.yaml
index 89318b6..5329b77 100644
--- a/.forgejo/workflows/build-devpi.yaml
+++ b/.forgejo/workflows/build-devpi.yaml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: docker-builder
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.forgejo/workflows/build-runner.yaml b/.forgejo/workflows/build-runner.yaml
index 54162b6..44be98f 100644
--- a/.forgejo/workflows/build-runner.yaml
+++ b/.forgejo/workflows/build-runner.yaml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: docker-builder
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
new file mode 100644
index 0000000..12f3259
--- /dev/null
+++ b/.github/actionlint.yaml
@@ -0,0 +1,5 @@
+self-hosted-runner:
+  labels:
+    - docker-builder
+    - ubuntu-latest
+    - ubuntu-22.04
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 421de65..d673cc3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -86,4 +86,5 @@ repos:
     rev: v1.7.10
     hooks:
       - id: actionlint-system
+        args: ['-config-file', '.github/actionlint.yaml']
         files: ^\.forgejo/workflows/