diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml
index 392f238..fdd51c2 100644
--- a/.gitea/workflows/build-and-deploy.yml
+++ b/.gitea/workflows/build-and-deploy.yml
@@ -33,35 +33,33 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
-      - name: Build and push all images
+      - name: Build+push ${{ vars.APP_NAME }}
         run: |
-          # Build app
           cd nuxt4
           docker build -t $REG/$REPO_OWNER/$APP_NAME:${{ github.sha }} -t $REG/$REPO_OWNER/$APP_NAME:latest .
           docker push $REG/$REPO_OWNER/$APP_NAME:${{ github.sha }}
           docker push $REG/$REPO_OWNER/$APP_NAME:latest
-          cd ..
 
-          # Build MCP Docker Server
+      - name: Build+push MCP Docker Server
+        run: |
           cd mcp-docker-server
           docker build -t $REG/$REPO_OWNER/mcp-docker-server:${{ github.sha }} -t $REG/$REPO_OWNER/mcp-docker-server:latest .
           docker push $REG/$REPO_OWNER/mcp-docker-server:${{ github.sha }}
           docker push $REG/$REPO_OWNER/mcp-docker-server:latest
-          cd ..
 
-          # Build MCP Gitea Server
+      - name: Build+push MCP Gitea Server
+        run: |
           cd mcp-gitea-server
           docker build -t $REG/$REPO_OWNER/mcp-gitea-server:${{ github.sha }} -t $REG/$REPO_OWNER/mcp-gitea-server:latest .
           docker push $REG/$REPO_OWNER/mcp-gitea-server:${{ github.sha }}
           docker push $REG/$REPO_OWNER/mcp-gitea-server:latest
-          cd ..
 
-          # Build MCP Metabase Server
+      - name: Build+push MCP Metabase Server
+        run: |
           cd mcp-metabase-server
           docker build -t $REG/$REPO_OWNER/mcp-metabase-server:${{ github.sha }} -t $REG/$REPO_OWNER/mcp-metabase-server:latest .
           docker push $REG/$REPO_OWNER/mcp-metabase-server:${{ github.sha }}
           docker push $REG/$REPO_OWNER/mcp-metabase-server:latest
-          cd ..
 
       - name: Info about environment
         run: |