diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 63f55e0..21dee92 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -1,5 +1,3 @@
-# Single pipeline: verify → build → push.
-# One workflow per push, one concurrency group per branch.
 name: CI
 
 on:
@@ -8,46 +6,43 @@ on:
   pull_request:
     branches: [main]
 
-concurrency:
-  group: ci-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
   REGISTRY: forgejo.riotpiao.com
   IMAGE: forgejo.riotpiao.com/rock/api-gateway
 
 jobs:
-  verify:
-    name: Vet, test, build
+  test:
+    name: Test
     runs-on: golang
     steps:
       - name: Install Node.js for actions runtime
         run: apt-get update && apt-get install -y nodejs
 
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: go vet
+      - name: Go vet
         run: go vet ./...
 
-      - name: go test -race
+      - name: Go test -race
         run: go test ./... -race
 
       - name: Static build (smoke)
         run: CGO_ENABLED=0 go build -trimpath -o gateway ./cmd/gateway
 
-  push:
-    name: Build and push image
-    needs: verify
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+  build-push:
+    name: Build & Push Image
+    needs: test
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: golang
     steps:
-      - name: Install Docker CLI and Node.js
+      - name: Install Node.js and Docker
         run: |
           apt-get update
-          apt-get install -y --no-install-recommends docker.io nodejs git
-          rm -rf /var/lib/apt/lists/*
+          apt-get install -y --no-install-recommends nodejs docker.io git
 
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Get short SHA
         id: sha
@@ -57,25 +52,24 @@ jobs:
 
       - name: Registry login
         run: |
-          echo "${REGISTRY_PAT}" | docker login "${REGISTRY}" \
-            --username rock --password-stdin
+          echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
+            --username "${REGISTRY_USER}" --password-stdin
         env:
-          REGISTRY_PAT: ${{ secrets.REGISTRY_PAT }}
+          REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
+          REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
 
-      - name: Build image
+      - name: Build Docker image
         run: |
-          docker build \
-            --build-arg "VERSION=${{ steps.sha.outputs.short_sha }}" \
+          docker build --no-cache \
             -t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
             -t "${IMAGE}:latest" \
             .
 
-      - name: Push image
+      - name: Push Docker image
         run: |
           docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
           docker push "${IMAGE}:latest"
           echo "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
 
       - name: Prune unused images
-        run: |
-          docker image prune -a --force 2>&1 | tail -3 || true
+        run: docker image prune -a --force 2>&1 | tail -3 || true