diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 4baa971..19795e5 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -7,18 +7,18 @@ on:
     branches: [main]
 
 jobs:
-  build:
-    runs-on: linux
+  build-and-deploy:
+    runs-on: linux:docker,dind
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24'
+      - name: Install Node.js
+        run: |
+          curl -fsSL https://deb.nodesource.com/setup_24.x | bash -
+          apt-get install -y nodejs
 
       - name: Install dependencies
         run: npm ci
@@ -26,24 +26,19 @@ jobs:
       - name: Build project
         run: npm run build
 
-  docker:
-    needs: build
-    runs-on: linux:docker,dind
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: Login to Gitea Container Registry
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |
           echo "${{ secrets.GITEA_TOKEN }}" | docker login http://192.168.1.39:3000 -u "${{ secrets.GITEA_USERNAME }}" --password-stdin
 
-      - name: Build and push
+      - name: Build and push Docker image
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |
           docker build -t 192.168.1.39:3000/username/pc-builder:latest -t 192.168.1.39:3000/username/pc-builder:${{ github.sha }} .
           docker push 192.168.1.39:3000/username/pc-builder:latest
           docker push 192.168.1.39:3000/username/pc-builder:${{ github.sha }}
 
       - name: Trigger deploy
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |
           curl -X POST http://192.168.1.39:9000/deploy || echo "Deploy webhook not reachable"