diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index e8f957c..6e43d26 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -67,8 +67,12 @@ jobs:
               base_changed=true
             fi
 
-            if git diff --name-only origin/main...HEAD | grep "^$variant/" > /dev/null; then
+            # Detect changes in variant folder
+            code_changed=$(git diff --name-only origin/main | grep "^$variant/" || true)
+            if [[ -n "$code_changed" ]]; then
               code_changed=true
+            else
+              code_changed=false
             fi
 
             should_build=false
@@ -95,7 +99,6 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build and Push Alpine Image
-        if: steps.compare_digests.outputs.alpine_changed == 'true'
         run: |
           IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_TS }}:alpine"
           echo "[INFO] Building $IMAGE"
@@ -112,14 +115,12 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build and Push Debian Image
-        if: steps.compare_digests.outputs.debian-base_changed == 'true'
         run: |
           IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_TS }}:debian"
           echo "[INFO] Building $IMAGE"
           docker buildx build --platform linux/amd64 --push -t "$IMAGE" ./debian
 
       - name: Build and Push Basic Image (depends on debian)
-        if: steps.compare_digests.outputs.debian-base_changed == 'true'
         run: |
           IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_TS }}:basic"
           echo "[INFO] Building $IMAGE"