diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index ef3d3cb..3ce079f 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -10,7 +10,7 @@ jobs:
   detect-changes:
     runs-on: ubuntu-latest
     outputs:
-      services: ${{ steps.detect.outputs.services }}
+      services_csv: ${{ steps.detect.outputs.services_csv }}
       has_changes: ${{ steps.detect.outputs.has_changes }}
     steps:
       - name: Checkout
@@ -32,19 +32,28 @@ jobs:
           echo "Changed files:"
           echo "$CHANGED_FILES"
 
-          ALL_SERVICES='["gateway","users","companies","jobs","leads","job-seekers","customers","payments","employees","photographers","makeup-artists","tutors","developers","video-editors","graphic-designers","social-media-managers","fitness-trainers","catering-services","ugc-content-creators","cron"]'
+          ALL_SERVICES='gateway,users,companies,jobs,leads,job-seekers,customers,payments,employees,photographers,makeup-artists,tutors,developers,video-editors,graphic-designers,social-media-managers,fitness-trainers,catering-services,ugc-content-creators,cron'
 
           # Build everything for workflow/docker/shared backend changes.
           if echo "$CHANGED_FILES" | grep -Eq '^(\.gitea/workflows/|Dockerfile|Dockerfile\.|Cargo\.toml|Cargo\.lock|crates/|scripts/)'; then
-            echo "services=$ALL_SERVICES" >> "$GITHUB_OUTPUT"
+            echo "services_csv=$ALL_SERVICES" >> "$GITHUB_OUTPUT"
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
-          SERVICES='[]'
+          SERVICES=''
           add_service() {
             local svc="$1"
-            SERVICES=$(echo "$SERVICES" | jq --arg s "$svc" 'if index($s) then . else . + [$s] end')
+            case ",${SERVICES}," in
+              *",${svc},"*) ;;
+              *)
+                if [ -z "$SERVICES" ]; then
+                  SERVICES="$svc"
+                else
+                  SERVICES="$SERVICES,$svc"
+                fi
+                ;;
+            esac
           }
 
           while IFS= read -r f; do
@@ -72,11 +81,11 @@ jobs:
             esac
           done <<< "$CHANGED_FILES"
 
-          if [ "$(echo "$SERVICES" | jq 'length')" -eq 0 ]; then
-            echo "services=[]" >> "$GITHUB_OUTPUT"
+          if [ -z "$SERVICES" ]; then
+            echo "services_csv=" >> "$GITHUB_OUTPUT"
             echo "has_changes=false" >> "$GITHUB_OUTPUT"
           else
-            echo "services=$SERVICES" >> "$GITHUB_OUTPUT"
+            echo "services_csv=$SERVICES" >> "$GITHUB_OUTPUT"
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
           fi
 
@@ -89,13 +98,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        service: ${{ fromJson(needs.detect-changes.outputs.services) }}
+        service:
+          - gateway
+          - users
+          - companies
+          - jobs
+          - leads
+          - job-seekers
+          - customers
+          - payments
+          - employees
+          - photographers
+          - makeup-artists
+          - tutors
+          - developers
+          - video-editors
+          - graphic-designers
+          - social-media-managers
+          - fitness-trainers
+          - catering-services
+          - ugc-content-creators
+          - cron
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         run: |
+          export DOCKER_HOST=unix:///var/run/docker.sock
+          docker version
           docker buildx create --use || true
           docker buildx inspect --bootstrap
 
@@ -106,13 +137,22 @@ jobs:
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
           set -euo pipefail
+          export DOCKER_HOST=unix:///var/run/docker.sock
           test -n "$REGISTRY_HOSTPORT"
           echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_HOSTPORT" -u "$REGISTRY_USERNAME" --password-stdin
 
       - name: Build and push
         env:
           REGISTRY_HOSTPORT: ${{ secrets.REGISTRY_HOSTPORT }}
+          SERVICES_CSV: ${{ needs.detect-changes.outputs.services_csv }}
         run: |
+          set -euo pipefail
+          export DOCKER_HOST=unix:///var/run/docker.sock
+          if [ -n "$SERVICES_CSV" ] && ! echo ",$SERVICES_CSV," | grep -q ",${{ matrix.service }},"; then
+            echo "Skipping unchanged service: ${{ matrix.service }}"
+            exit 0
+          fi
+
           docker buildx build --push \
             -f Dockerfile.simple \
             --build-arg SERVICE_NAME=${{ matrix.service }} \