diff --git a/.github/workflows/package_and_upload_all.yml b/.github/workflows/package_and_upload_all.yml
index 369aa5b..274a4a7 100644
--- a/.github/workflows/package_and_upload_all.yml
+++ b/.github/workflows/package_and_upload_all.yml
@@ -48,6 +48,17 @@ on:
         required: false
 
 jobs:
+  extract-ci-ref:
+    runs-on: ubuntu-latest
+    outputs:
+      ci_ref: ${{ steps.extract.outputs.ci_ref }}
+    steps:
+      - id: extract
+        run: |
+          CI_REF="${{ github.workflow_ref }}"
+          CI_REF="${CI_REF#*@}"
+          echo "ci_ref=$CI_REF" >> "$GITHUB_OUTPUT"
+
   linux_x86_64_llvm:
     uses: ./.github/workflows/package_and_upload.yml
     with:
@@ -109,6 +120,7 @@ jobs:
 
   cortex-m_llvm:
     runs-on: ubuntu-latest
+    needs: extract-ci-ref
     env:
       VERBOSE: 1
       CONAN_REMOTE_USER: ${{ secrets.conan_remote_user }}
@@ -135,7 +147,7 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           repository: libhal/ci
-          ref: ${{ github.workflow_sha }}
+          ref: ${{ needs.extract-ci-ref.outputs.ci_ref }}
           path: ci-repo
 
       - name: 📦 Build packages for all Cortex-M architectures
@@ -164,6 +176,7 @@ jobs:
 
   cortex-m_gcc:
     runs-on: ubuntu-latest
+    needs: extract-ci-ref
     if: ${{ inputs.modules_support_needed == false }}
     env:
       VERBOSE: 1
@@ -191,7 +204,7 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           repository: libhal/ci
-          ref: ${{ github.workflow_sha }}
+          ref: ${{ needs.extract-ci-ref.outputs.ci_ref }}
           path: ci-repo
 
       - name: 📦 Build packages for all Cortex-M architectures