diff --git a/.github/workflows/build-and-test-template.yml b/.github/workflows/build-and-test-template.yml
index 023ce48..abbe165 100644
--- a/.github/workflows/build-and-test-template.yml
+++ b/.github/workflows/build-and-test-template.yml
@@ -223,7 +223,7 @@ jobs:
       - name: Download a single artifact
         uses: actions/download-artifact@v4
         with:
-          pattern: "x86_64-w64-mingw32-cxx11"
+          pattern: llvm-assert-${{ inputs.target }}
       - name: "Build Julia Assert"
         run: |
           set -o xtrace
@@ -234,5 +234,5 @@ jobs:
           git fetch
           git switch llvm-19
           mkdir -p deps/srccache
-          mv ../LLVM_full_assert.v$LLVM_VERSION_MAJOR.0.0.x86_64-w64-mingw32-cxx11.tar.gz deps/srccache/libLLVM.v18.1.7+2.x86_64-w64-mingw32-cxx11.tar.gz
+          mv ../LLVM_full_assert.v${LLVM_VERSION_MAJOR}.0.0.${{ inputs.target }}.tar.gz deps/srccache/libLLVM.v18.1.7+2.${{ inputs.target }}.tar.gz
           make -j4 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e8608a1..3779a21 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -17,12 +17,16 @@ jobs:
     outputs:
       LLVM_VERSION: ${{ steps.fetch.outputs.LLVM_VERSION }}
       LLVM_VERSION_MAJOR: ${{ steps.fetch.outputs.LLVM_VERSION_MAJOR }}
+    env:
+      LLVM_VERSION: ${{ github.event.inputs.LLVM_VERSION }}
     steps:
       - name: "Fetch"
         id: fetch
         run: |
           set -o xtrace
-          LLVM_VERSION=$(git ls-remote https://github.com/llvm/llvm-project.git | grep 'refs/heads/main$' | awk '{print $1}')
+          if [-z "$LLVM_VERSION" ]; then
+            LLVM_VERSION=$(git ls-remote https://github.com/llvm/llvm-project.git | grep 'refs/heads/main$' | awk '{print $1}')
+          fi
           LLVM_VERSION_MAJOR=$(curl -s https://raw.githubusercontent.com/llvm/llvm-project/$LLVM_VERSION/cmake/Modules/LLVMVersion.cmake | grep 'set(LLVM_VERSION_MAJOR' | awk '{print $2}' | tr -d ')')
           echo "LLVM_VERSION=$LLVM_VERSION" >> "$GITHUB_OUTPUT"
           echo "LLVM_VERSION_MAJOR=$LLVM_VERSION_MAJOR" >> "$GITHUB_OUTPUT"