diff --git a/.forgejo/workflows/build-and-publish.yml b/.forgejo/workflows/build-and-publish.yml
index 6f87535..2d95eb0 100644
--- a/.forgejo/workflows/build-and-publish.yml
+++ b/.forgejo/workflows/build-and-publish.yml
@@ -39,8 +39,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dockerfile: ["worker.Dockerfile", "server.Dockerfile"]
-        image-name: ["${{ vars.IMAGE_NAME_WORKER }}", "${{ vars.IMAGE_NAME_SERVER }}"]
+        include:
+          - dockerfile: worker.Dockerfile
+            image-name: ${{ vars.IMAGE_NAME_WORKER }}
+          - dockerfile: server.Dockerfile
+            image-name: ${{ vars.IMAGE_NAME_SERVER }}
     steps:
       - name: Build and Push Image
         uses: docker/build-push-action@v6