diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index a16c626..9fa251a 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -32,20 +32,21 @@ jobs:
             echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
           fi
 
-      - name: Build images
+      - name: Build web image
         run: |
-          pushd ./web
           docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} .
-          popd
-          pushd ./data_handler
+        working-directory: ./web
+
+      - name: Build data_handler image
+        run: |
           docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} .
-          popd
+        working-directory: ./data_handler
 
       - name: Push images to Container Registry
         run: |
           docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }}
           docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }}
-        if: github.event_name == 'push' && github.ref_name == 'main'
+        if: github.event_name == 'push'
 
       - name: Update docker-compose.yml image tags
         run: |