diff --git a/.github/workflows/wf_build_artifacts.yaml b/.github/workflows/wf_build_artifacts.yaml
index 368ec0117..bd373b91e 100644
--- a/.github/workflows/wf_build_artifacts.yaml
+++ b/.github/workflows/wf_build_artifacts.yaml
@@ -77,7 +77,7 @@ jobs:
         echo BUILD_NEEDED=$BUILD_NEEDED >> $GITHUB_OUTPUT
 
     - name: "Setup nix-remote-builder"
-      uses: dbarrosop/nix-remote-builder-aws@asd
+      uses: dbarrosop/nix-remote-builder-aws@v0.4.0
       id: nix-remote-builder
       with:
         name: ${{ inputs.NAME }}-${{ inputs.GIT_REF }}
@@ -86,12 +86,12 @@ jobs:
         region: "eu-central-1"
         availability-zone: "eu-central-1c"
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      # if: ${{ ( matrix.platform == 'aarch64' ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
+      if: ${{ ( matrix.platform == 'aarch64' ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - name: "Setup nix-remote-builder in nix.conf"
       run: |
           echo "builders = ssh://ec2-user@${{ steps.nix-remote-builder.outputs.publicDnsName }} aarch64-linux;" >> ~/.config/nix/nix.conf
-      # if: ${{ ( matrix.platform == 'aarch64' ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
+      if: ${{ ( matrix.platform == 'aarch64' ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - name: Cache nix store
       uses: actions/cache@v4
@@ -108,7 +108,7 @@ jobs:
           !/nix/var/nix/db/reserved
         key: nix-${{ inputs.NAME }}-build-${{ runner.os }}-${{ matrix.platform }}-${{ hashFiles('nix/**.nix', 'flake.nix', 'flake.lock') }}
         restore-keys: nix-${{ inputs.NAME }}-build-${{ runner.OS }}-${{ matrix.platform }}-main
-      # if: ${{ steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
+      if: ${{ steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - uses: docker/setup-qemu-action@v3
       if: ${{ ( matrix.platform == 'aarch64' ) }}
@@ -143,7 +143,7 @@ jobs:
             fi
             ((attempt++))
         done
-      if: ${{ ( matrix.platform == 'aarch64' ) }} # && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
+      if: ${{ ( matrix.platform == 'aarch64' ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - name: "Build artifact"
       run: |
@@ -184,7 +184,7 @@ jobs:
         echo ${{ secrets.NIX_CACHE_PRIV_KEY }} > cache-priv-key.pem
         nix store sign --key-file cache-priv-key.pem --all
         nix copy --to s3://nhost-nix-cache\?region=eu-central-1 .\#packages.${{ matrix.platform }}-linux.docker-image
-      # if: ${{ ( inputs.DOCKER ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
+      if: ${{ ( inputs.DOCKER ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - run: rm cache-priv-key.pem || echo "file not found"
       if: always()
diff --git a/.github/workflows/wf_check.yaml b/.github/workflows/wf_check.yaml
index 696c22a54..18a5287d4 100644
--- a/.github/workflows/wf_check.yaml
+++ b/.github/workflows/wf_check.yaml
@@ -90,6 +90,7 @@ jobs:
 
     - name: "Run checks"
       run: make check
+      if: ${{ steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - name: "Cache nix store on s3"
       run: |
diff --git a/Makefile b/Makefile
index 7aa9d02e0..9916974e7 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ check-dry-run:  ## Run nix flake check
 		--dry-run \
 		--json \
 		--print-build-logs \
-		.\#checks.$(ARCH)-$(OS).go-checks
+		.\#checks.$(ARCH)-$(OS).node-checks
 
 
 .PHONY: dev-env-up