diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 62ba87e..dc24ef6 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -36,18 +36,23 @@ jobs:
           git tag "${{ steps.version.outputs.version }}" -m "[forgejo-action-tag]"
           git push origin --tags
 
-  webserver:
+  docker-build:
     runs-on: host
     needs:
         - release
+    strategy:
+      matrix:
+        repo:
+          - alpine-php8-webserver
+          - alpine-php8-cron-webserver
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           github-server-url: https://git.h2-invent.com
-          repository: Public-System-Design/alpine-php8-webserver
+          repository: Public-System-Design/${{ matrix.repo }}
           ref: main
-          path: alpine-php8-webserver
+          path: ${{ matrix.repo }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -59,42 +64,10 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: ./alpine-php8-webserver
+          context: ./${{ matrix.repo }}
           push: true
           tags: |
-            git.h2-invent.com/public-system-design/alpine-php8-webserver:${{ needs.release.outputs.version }}
-            git.h2-invent.com/public-system-design/alpine-php8-webserver:latest
-          build-args: |
-            VERSION=${{ needs.release.outputs.version }}
-
-  cron:
-    runs-on: host
-    needs:
-        - release
-        - webserver
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          github-server-url: https://git.h2-invent.com
-          repository: Public-System-Design/alpine-php8-cron-webserver
-          ref: main
-          path: alpine-php8-cron-webserver
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: git.h2-invent.com
-          username: ${{ secrets.FORGEJO_ACTION_PACKAGE_RW_USER }}
-          password: ${{ secrets.FORGEJO_ACTION_PACKAGE_RW_KEY }}
-          
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./alpine-php8-cron-webserver
-          push: true
-          tags: |
-            git.h2-invent.com/public-system-design/alpine-php8-cron-webserver:${{ needs.release.outputs.version }}
-            git.h2-invent.com/public-system-design/alpine-php8-cron-webserver:latest
+            git.h2-invent.com/public-system-design/${{ matrix.repo }}:${{ needs.release.outputs.version }}
+            git.h2-invent.com/public-system-design/${{ matrix.repo }}:latest
           build-args: |
             VERSION=${{ needs.release.outputs.version }}