diff --git a/.github/workflows/android-windows.yml b/.github/workflows/android-windows.yml
index de35e0e30dc..01bb551375d 100644
--- a/.github/workflows/android-windows.yml
+++ b/.github/workflows/android-windows.yml
@@ -51,9 +51,7 @@ jobs:
 
       - uses: seanmiddleditch/gha-setup-ninja@v5
       - uses: lukka/get-cmake@latest
-
-      # - name: Set Up sccache
-      #   uses: mozilla-actions/sccache-action@v0.0.5
+      - uses: mozilla-actions/sccache-action@v0.0.7
 
       - name: Install Qt for Android
         uses: ./.github/actions/qt-android
diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml
index ec2af170c27..b386ec98153 100644
--- a/.github/workflows/custom.yml
+++ b/.github/workflows/custom.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         BuildType: [Release]
-        Arch: [x64] # Arm64
+        Arch: [x64]
 
     defaults:
       run:
@@ -74,8 +74,8 @@ jobs:
       # - name: Install Gstreamer
       #   run: choco install --no-progress gstreamer gstreamer-devel --version=${{ env.GST_VERSION }}
 
-      # - name: Set Up sccache
-      #   uses: mozilla-actions/sccache-action@v0.0.5
+      - name: Set Up sccache
+        uses: mozilla-actions/sccache-action@v0.0.7
 
       - name: Set Up Cache
         uses: hendrikmuhs/ccache-action@main
@@ -99,20 +99,6 @@ jobs:
           modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
-      - name: Install Qt for Windows (Arm64)
-        if: matrix.Arch == 'Arm64'
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          aqtversion: ==3.1.*
-          host: windows
-          target: desktop
-          arch: win64_msvc2022_arm64 # _cross_compiled
-          dir: ${{ runner.temp }}
-          extra: --autodesktop
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
-          cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1
         with:
@@ -122,24 +108,10 @@ jobs:
 
       - name: Configure
         working-directory: ${{ runner.temp }}\shadow_build_dir
-        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja ^
-              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }} ^
+        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
+              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
 
       - name: Build
         working-directory: ${{ runner.temp }}\shadow_build_dir
         run: cmake --build . --target all --config ${{ matrix.BuildType }}
-
-      # - name: Install
-      #   working-directory: ${{ runner.temp }}\shadow_build_dir
-      #   run: cmake --install . --config ${{ matrix.BuildType }}
-
-      # - name: Upload Build File
-      #   if: matrix.BuildType == 'Release'
-      #   uses: ./.github/actions/upload
-      #   with:
-      #     artifact_name: ${{ env.ARTIFACT }}
-      #     aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      #     aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      #     source: ''
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 867ee082673..be4dd0feb25 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -88,7 +88,7 @@ jobs:
           save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
           evict-old-files: 'job'
 
-      - name: Install Qt for Linux
+      - name: Install Qt for Linux (x64)
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c4e8856b571..965daae8b96 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -80,7 +80,6 @@ jobs:
           evict-old-files: 'job'
 
       - name: Install Qt for Windows (x64)
-        if: matrix.Arch == 'x64'
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
@@ -92,6 +91,7 @@ jobs:
           modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
+      # Note: Must Use QtMultimedia VideoReceiver or build GStreamer manually
       - name: Install Qt for Windows (Arm64)
         if: matrix.Arch == 'Arm64'
         uses: jurplel/install-qt-action@v4
@@ -100,7 +100,7 @@ jobs:
           aqtversion: ==3.1.*
           host: windows
           target: desktop
-          arch: win64_msvc2022_arm64 # _cross_compiled
+          arch: win64_msvc2022_arm64_cross_compiled
           dir: ${{ runner.temp }}
           extra: --autodesktop
           modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
@@ -109,14 +109,16 @@ jobs:
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1
         with:
-          arch: x64
+          arch: ${{ matrix.Arch == 'Arm64' && 'amd64_arm64' || 'x64' }}
 
       - run: mkdir ${{ runner.temp }}\shadow_build_dir
 
       - name: Configure
         working-directory: ${{ runner.temp }}\shadow_build_dir
-        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja ^
-              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }} ^
+        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
+              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
+              -DQT_HOST_PATH="${{ env.QT_ROOT_DIR }}/../msvc2022_64"
+              -DQT_DEBUG_FIND_PACKAGE=ON
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
 
       - name: Build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecff69c16d1..f38f40ceefe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,11 +197,14 @@ find_package(Qt6
         Quick3D
         Quick3DTools
         SerialPort
-        WaylandClient
     HINTS
         ${QT_LIBRARY_HINTS}
 )
 
+if(LINUX)
+    find_package(Qt6::WaylandClient ${QT_MINIMUM_VERSION})
+endif()
+
 if(NOT Qt6LinguistTools_DIR)
     set(Qt6LinguistTools_DIR ${QT_HOST_PATH}/lib/cmake/Qt6LinguistTools)
 endif()