diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cc41578cf4..70ad12b993 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -3,20 +3,24 @@ name: "Code scanning - action"
 on:
   push:
     branches:
-    - '*/dev'
-    - '*/contrib'
+      - "*/dev"
+      - "*/contrib"
+      - "release/*"
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
-    - '*/dev'
-    - '*/contrib'
+      - "*/dev"
+      - "*/contrib"
+      - "release/*"
+  schedule:
+    - cron: "33 2 * * 1"
 
 permissions:
   contents: read
 
 env:
   dotnetVersion: 9.x
-  dotnetIncludePreviewVersions: true
+  dotnetIncludePreviewVersions: "preview"
   solution: umbraco.sln
   buildConfiguration: SkipTests
   DOTNET_NOLOGO: true
@@ -34,29 +38,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        submodules: true
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        config-file: ./.github/config/codeql-config.yml
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          config-file: ./.github/config/codeql-config.yml
 
-    - name: Use .NET ${{ env.dotnetVersion }}
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: ${{ env.dotnetVersion }}
-        include-prerelease: ${{ env.dotnetIncludePreviewVersions }}
+      - name: Use .NET ${{ env.dotnetVersion }}
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ env.dotnetVersion }}
+          dotnet-quality: ${{ env.dotnetIncludePreviewVersions }}
 
-    - name: Run dotnet restore
-      run: dotnet restore ${{ env.solution }}
+      - name: Run dotnet restore
+        run: dotnet restore ${{ env.solution }}
 
-    - name: Run dotnet build
-      run: dotnet build ${{ env.solution }} --configuration ${{ env.buildConfiguration }} --no-restore -p:ContinuousIntegrationBuild=true
+      - name: Run dotnet build
+        run: dotnet build ${{ env.solution }} --configuration ${{ env.buildConfiguration }} --no-restore -p:ContinuousIntegrationBuild=true
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/codeql.yml b/src/Umbraco.Web.UI.Client/.github/workflows/codeql.yml
deleted file mode 100644
index f3f3a37812..0000000000
--- a/src/Umbraco.Web.UI.Client/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: 'CodeQL'
-
-on:
-  push:
-    branches:
-      - main
-      - release/*
-      - v*/dev
-  pull_request:
-    branches:
-      - main
-      - release/*
-      - v*/dev
-  schedule:
-    - cron: '33 2 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript']
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          # queries: security-extended,security-and-quality
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3