diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml
index 48c477706..957c7090b 100644
--- a/.github/workflows/codeql_linux.yml
+++ b/.github/workflows/codeql_linux.yml
@@ -33,7 +33,7 @@ jobs:
 
   analyze-linux:
 
-    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.arch }}"
 
     runs-on: ubuntu-22.04
 
@@ -68,10 +68,13 @@ jobs:
         ui:
           - name: SDL GUI
             qt: off
+            qt6: off
+            slug: -SDL
             static: on
-          - name: Qt GUI
+          - name: Qt 5 GUI
             qt: on
-            slug: -Qt
+            qt6: off
+            slug: -Qt5
             packages: >-
               qtbase5-dev
               qtbase5-private-dev
@@ -79,6 +82,20 @@ jobs:
               qttranslations5-l10n
               libevdev-dev
               libxkbcommon-x11-dev
+        environment:
+          - arch: x86_64
+            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: "-x86_64"
+            runner: ubuntu-22.04
+#          - arch: arm64
+#            toolchain: ./cmake/flags-gcc-aarch64.cmake
+#            slug: -arm64
+#            runner: ubuntu-22.04-arm
+#        exclude:
+#          - dynarec:
+#              new: off
+#            environment:
+#              arch: arm64
 
     steps:
       - name: Install dependencies
@@ -114,11 +131,11 @@ jobs:
 
       - name: Configure CMake
         run: >-
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-          --toolchain ./cmake/flags-gcc-x86_64.cmake
+          cmake -S . -B build --preset ${{ matrix.build.preset }}
+          --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
-          -D CMAKE_INSTALL_PREFIX=./build/artifacts
           -D QT=${{ matrix.ui.qt }}
+          -D USE_QT6=${{ matrix.ui.qt6 }}
 
       - name: Build
         run: |
diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml
index 22566f01f..488cbfd49 100644
--- a/.github/workflows/codeql_macos.yml
+++ b/.github/workflows/codeql_macos.yml
@@ -31,11 +31,11 @@ on:
 
 jobs:
 
-  analyze-macos13-x86_64:
+  analyze-macos:
 
-    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.arch }}"
 
-    runs-on: macos-13
+    runs-on: ${{ matrix.environment.runner }}
 
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -66,13 +66,29 @@ jobs:
             new: on
             slug: -NDR
         ui:
-          - name: SDL GUI
-            qt: off
-          - name: Qt GUI
+#          - name: SDL GUI
+#            qt: off
+#            slug: -SDL
+#            static: on
+          - name: Qt 5 GUI
             qt: on
-            slug: -Qt
+            slug: -Qt5
             packages: >-
               qt@5
+        environment:
+          - arch: x86_64
+            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: -x86_64
+            runner: macos-13
+#          - arch: arm64
+#            toolchain: ./cmake/llvm-macos-aarch64.cmake
+#            slug: -arm64
+#            runner: macos-14
+#        exclude:
+#          - dynarec:
+#              new: off
+#            environment:
+#              arch: arm64
 
     steps:
       - name: Install dependencies
@@ -103,10 +119,9 @@ jobs:
 
       - name: Configure CMake
         run: >-
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-          --toolchain ./cmake/flags-gcc-x86_64.cmake
+          cmake -S . -B build --preset ${{ matrix.build.preset }}
+          --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
-          -D CMAKE_INSTALL_PREFIX=./build/artifacts
           -D QT=${{ matrix.ui.qt }}
           -D Qt5_ROOT=$(brew --prefix qt@5)
           -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml
index 487e8dc05..d70c6fd5f 100644
--- a/.github/workflows/codeql_windows_msys2.yml
+++ b/.github/workflows/codeql_windows_msys2.yml
@@ -1,4 +1,4 @@
-name: CodeQL Analysis (Windows, msys2)
+name: CodeQL Analysis (Windows)
 
 on:
 
@@ -31,9 +31,9 @@ on:
 
 jobs:
 
-  analyze-msys2:
+  analyze-windows:
 
-    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }})"
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
     runs-on: ${{ matrix.environment.runner }}
 
@@ -70,14 +70,15 @@ jobs:
             new: on
             slug: -NDR
         ui:
-          - name: Qt GUI
+          - name: Qt 5 GUI
             qt: on
+            slug: -Qt5
             static: off
-            slug: -Qt
             packages: >-
               qt5-base:p
               qt5-tools:p
               vulkan-headers:p
+#              qt5-static:p
         environment:
 #          - msystem: MSYS
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
@@ -147,10 +148,9 @@ jobs:
 
       - name: Configure CMake
         run: >-
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
+          cmake -S . -B build --preset ${{ matrix.build.preset }}
           --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
-          -D CMAKE_INSTALL_PREFIX=./build/artifacts
           -D QT=${{ matrix.ui.qt }}
           -D STATIC_BUILD=${{ matrix.ui.static }}