diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index da1d1fee6d..7b47d163c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,45 +70,46 @@ jobs:
     build-templates:
         name: Build templates for Dependabot
         needs: workflow-config
-        if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
               with:
                   ref: ${{ github.head_ref }}
                   token: ${{ secrets.LASTMJS_GITHUB_TOKEN }}
 
             - uses: ./.github/actions/setup_node
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
 
             - uses: ./.github/actions/setup_dfx
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
 
             - run: npm install
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
 
             - name: Install global dependencies
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
               run: |
                   AZLE_VERBOSE=true npx azle install-global-dependencies --rust --wasi2ic
 
             - name: Build stable template
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
               run: AZLE_VERBOSE=true npx azle template
 
             - name: Build experimental template
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
               run: AZLE_VERBOSE=true npx azle template --experimental
 
             - uses: ./.github/actions/commit_and_push
+              if: ${{ needs.workflow-config.outputs.is-dependabot == 'true' }}
               with:
                   branch-name: ${{ github.head_ref }}
                   commit-message: 'chore: update templates for dependency changes'
                   gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }}
 
-        outputs:
-            result: success
-
     get-exclude-dirs:
         name: Get exclude directories
-        needs:
-            - workflow-config
-            - build-templates
-        if: ${{ always() && (needs.build-templates.result == 'success' || needs.build-templates.result == 'skipped') }}
+        needs: workflow-config
         runs-on: ubuntu-latest
         outputs:
             exclude-dirs: ${{ steps.get-exclude-dirs.outputs.exclude-dirs }}
@@ -127,6 +128,7 @@ jobs:
         needs:
             - workflow-config
             - get-exclude-dirs
+            - build-templates
         strategy:
             fail-fast: false
             matrix: