diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 995eab0..e071824 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,6 +27,8 @@ jobs:
       - name: Release - Checkout repository
         uses: actions/checkout@v6
         with:
+          # Fetch tags so workflow_dispatch can resolve and checkout the target tag
+          fetch-tags: true
           # Explicitly checkout the tag ref to ensure we build the correct commit
           # For tag pushes: refs/tags/vX.Y.Z
           # For workflow_dispatch: refs/heads/<branch> (will be validated below)
@@ -91,11 +93,11 @@ jobs:
       - name: Release - Build server
         run: npm run build -w server
 
-      - name: Release - Initialize CodeQL
-        uses: github/codeql-action/init@v3
+      - name: Release - Setup CodeQL environment
+        uses: ./.github/actions/setup-codeql-environment
         with:
-          languages: javascript-typescript
-          tools: latest
+          add-to-path: true
+          install-language-runtimes: false
 
       - name: Release - Publish CodeQL tool query packs
         if: startsWith(github.ref, 'refs/tags/')