diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c31ea8cb131..9f1997eb172 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,13 +1,16 @@
 name: Build Docker image
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - '*.*.*'
+    branches:
+      - '**'
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -16,26 +19,29 @@ jobs:
         run: mkdir src
 
       - name: Checkout opengever.maintenance
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 4teamwork/opengever.maintenance
           path: src/opengever.maintenance
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: remote
+          endpoint: tcp://buildkitd.buildx:1234
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata from Git reference
         id: meta_ogcore
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             4teamwork/ogcore
@@ -43,7 +49,7 @@ jobs:
             type=pep440,pattern={{version}}
 
       - name: Build and push ogcore
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/core/Dockerfile
@@ -58,7 +64,7 @@ jobs:
 
       - name: Extract metadata from Git reference for ogtestserver
         id: meta_ogtestserver
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             4teamwork/ogtestserver
@@ -66,7 +72,7 @@ jobs:
             type=pep440,pattern={{version}}
 
       - name: Build and push ogtestserver
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/testserver/Dockerfile