diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index af4e82e..1618625 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -4,14 +4,17 @@ on:
   push:
     branches: [main]
   pull_request:
+    branches: [main]
+
+env:
+  GOPRIVATE: forgejo.riotpiao.com
+  REGISTRY: forgejo.riotpiao.com
+  IMAGE: forgejo.riotpiao.com/rock/poimen-workflows
 
 jobs:
-  test-build-push:
+  test:
+    name: Test
     runs-on: golang
-    env:
-      GOPRIVATE: forgejo.riotpiao.com
-      REGISTRY: forgejo.riotpiao.com
-      IMAGE: forgejo.riotpiao.com/rock/poimen-workflows
     steps:
       - name: Install Node.js for actions runtime
         run: apt-get update && apt-get install -y nodejs
@@ -22,36 +25,55 @@ jobs:
       - name: Download dependencies
         run: go mod download
 
-      - name: Vet
+      - name: Go vet
         run: go vet ./...
 
-      - name: Test
+      - name: Go test
         run: go test ./...
 
       - name: Build binary
         run: CGO_ENABLED=0 GOOS=linux go build -o /tmp/poimen-worker ./cmd/worker
 
+  build-push:
+    name: Build & Push Image
+    needs: test
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    runs-on: golang
+    steps:
+      - name: Install Node.js and Docker
+        run: |
+          apt-get update
+          apt-get install -y nodejs docker.io
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Get short SHA
         id: sha
-        run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Install Docker CLI
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        run: apt-get update && apt-get install -y docker.io
+        run: |
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
 
       - name: Registry login
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         run: |
-          echo "${{ secrets.FORGEJO_REGISTRY_TOKEN }}" | docker login "${REGISTRY}" \
-            --username "${{ secrets.FORGEJO_REGISTRY_USER }}" --password-stdin
+          echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
+            --username "${REGISTRY_USER}" --password-stdin
+        env:
+          REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
+          REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
 
-      - name: Build and push image
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+      - name: Build Docker image
         run: |
-          docker build \
+          docker build --no-cache \
             -t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
             -t "${IMAGE}:latest" \
             .
+
+      - name: Push Docker image
+        run: |
           docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
           docker push "${IMAGE}:latest"
-          echo "✓ Pushed ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
+          echo "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
+
+      - name: Prune unused images
+        run: docker image prune -a --force 2>&1 | tail -3 || true