diff --git a/.github/workflows/TestCITools.yml b/.github/workflows/TestCITools.yml
index 6d26136..0fe7532 100644
--- a/.github/workflows/TestCITools.yml
+++ b/.github/workflows/TestCITools.yml
@@ -20,7 +20,8 @@ jobs:
       override_repository: duckdb/extension-template
       override_ref: main
       duckdb_version: v1.0.0
-      override_ci_tools_ref: ${{ github.sha }}
+      override_ci_tools_repository: ${{github.event.action == 'pull_request' && github.event.pull_request.head.sha || github.sha}}
+      override_ci_tools_ref: ${{github.event.action == 'pull_request' && github.event.pull_request.head.sha || github.sha}}
 
   delta-extension-main:
     name: Rust builds (using Delta extension)
@@ -30,6 +31,6 @@ jobs:
       enable_rust: true
       override_repository: duckdb/duckdb_delta
       override_ref: main
-      override_ci_tools_ref: ${{ github.sha }}
+      override_ci_tools_ref: ${{github.event.action == 'pull_request' && github.event.pull_request.head.sha || github.sha}}
       duckdb_version: v1.0.0
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
index fd99d3f..ab5ed67 100644
--- a/.github/workflows/_extension_distribution.yml
+++ b/.github/workflows/_extension_distribution.yml
@@ -59,11 +59,17 @@ on:
         required: false
         type: string
         default: ""
-      # The ref for which to use the CI tools
+      # Override the repo for the CI tools (for testing CI tools itself)
+      override_ci_tools_repository:
+        required: false
+        type: string
+        default: ""
+      # Override the ref for the CI tools (for testing CI tools itself)
       override_ci_tools_ref:
         required: false
         type: string
         default: ""
+
 jobs:
   generate_matrix:
     name: Generate matrix
@@ -219,11 +225,14 @@ jobs:
           fetch-depth: 0
           submodules: 'true'
 
-      - name: Checkout Extension CI tools
+      - uses: actions/checkout@v4
+        name: Checkout Extension CI tools
         if: ${{inputs.override_ci_tools_ref != ''}}
-        run: |
-          cd extension-ci-tools
-          git checkout ${{ inputs.override_ci_tools_ref }}
+        with:
+          path: 'extension-ci-tools'
+          ref: ${{ inputs.override_ci_tools_ref }}
+          repository: ${{ inputs.override_ci_tools_repository }}
+          fetch-depth: 0
 
       - name: Checkout DuckDB to version
         run: |
@@ -330,11 +339,14 @@ jobs:
         with:
           python-version: '3.11'
 
-      - name: Checkout Extension CI tools
+      - uses: actions/checkout@v4
+        name: Checkout Extension CI tools
         if: ${{inputs.override_ci_tools_ref != ''}}
-        run: |
-          cd extension-ci-tools
-          git checkout ${{ inputs.override_ci_tools_ref }}
+        with:
+          path: 'extension-ci-tools'
+          ref: ${{ inputs.override_ci_tools_ref }}
+          repository: ${{ inputs.override_ci_tools_repository }}
+          fetch-depth: 0
 
       - name: Checkout DuckDB to version
         run: |
@@ -424,11 +436,14 @@ jobs:
           update-rtools: true
           rtools-version: '42' # linker bug in 43
 
-      - name: Checkout Extension CI tools
+      - uses: actions/checkout@v4
+        name: Checkout Extension CI tools
         if: ${{inputs.override_ci_tools_ref != ''}}
-        run: |
-          cd extension-ci-tools
-          git checkout ${{ inputs.override_ci_tools_ref }}
+        with:
+          path: 'extension-ci-tools'
+          ref: ${{ inputs.override_ci_tools_ref }}
+          repository: ${{ inputs.override_ci_tools_repository }}
+          fetch-depth: 0
 
       - name: Checkout DuckDB to version
         run: |
@@ -489,11 +504,14 @@ jobs:
           fetch-depth: 0
           submodules: 'true'
 
-      - name: Checkout Extension CI tools
+      - uses: actions/checkout@v4
+        name: Checkout Extension CI tools
         if: ${{inputs.override_ci_tools_ref != ''}}
-        run: |
-          cd extension-ci-tools
-          git checkout ${{ inputs.override_ci_tools_ref }}
+        with:
+          path: 'extension-ci-tools'
+          ref: ${{ inputs.override_ci_tools_ref }}
+          repository: ${{ inputs.override_ci_tools_repository }}
+          fetch-depth: 0
 
       - name: Checkout DuckDB to version
         run: |