diff --git a/.github/workflows/package_and_upload_all.yml b/.github/workflows/package_and_upload_all.yml
index 274a4a7..5236fc3 100644
--- a/.github/workflows/package_and_upload_all.yml
+++ b/.github/workflows/package_and_upload_all.yml
@@ -40,6 +40,10 @@ on:
       modules_support_needed:
         type: boolean
         default: False
+      ci_ref:
+        type: string
+        default: "5.x.y"
+        description: "Git ref (branch, tag, or SHA) of libhal/ci to use for scripts"
 
     secrets:
       conan_remote_password:
@@ -48,17 +52,6 @@ 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:
@@ -120,7 +113,6 @@ jobs:
 
   cortex-m_llvm:
     runs-on: ubuntu-latest
-    needs: extract-ci-ref
     env:
       VERBOSE: 1
       CONAN_REMOTE_USER: ${{ secrets.conan_remote_user }}
@@ -147,7 +139,7 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           repository: libhal/ci
-          ref: ${{ needs.extract-ci-ref.outputs.ci_ref }}
+          ref: ${{ inputs.ci_ref }}
           path: ci-repo
 
       - name: 📦 Build packages for all Cortex-M architectures
@@ -176,7 +168,6 @@ jobs:
 
   cortex-m_gcc:
     runs-on: ubuntu-latest
-    needs: extract-ci-ref
     if: ${{ inputs.modules_support_needed == false }}
     env:
       VERBOSE: 1
@@ -204,7 +195,7 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           repository: libhal/ci
-          ref: ${{ needs.extract-ci-ref.outputs.ci_ref }}
+          ref: ${{ inputs.ci_ref }}
           path: ci-repo
 
       - name: 📦 Build packages for all Cortex-M architectures