diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 145439d7a..c5526049c 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -205,7 +205,6 @@ jobs:
       - name: "Delete remote compiler cache (ccache)"
         if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
         continue-on-error: true
-        shell: bash
         env:
           CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
           GH_TOKEN: ${{ github.token }}
@@ -271,10 +270,8 @@ jobs:
             make_package: 1
             override_target: 13
             package_suffix: "-macOS13_Intel"
-            # Read https://aqtinstall.readthedocs.io/en/latest/getting_started.html#installing-a-subset-of-qt-archives-advanced
-            # and check https://ddalcino.github.io/aqt-list-server/
-            qt_archives: qtbase qtdeclarative qtsvg qttools qttranslations
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations
+            qt_modules: qtwebsockets
             qt_version: 6.11.1
             soc: Intel
             type: Release
@@ -290,10 +287,8 @@ jobs:
             make_package: 1
             override_target: 14
             package_suffix: "-macOS14"
-            # Read https://aqtinstall.readthedocs.io/en/latest/getting_started.html#installing-a-subset-of-qt-archives-advanced
-            # and check https://ddalcino.github.io/aqt-list-server/
-            qt_archives: qtbase qtdeclarative qtsvg qttools qttranslations
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations
+            qt_modules: qtwebsockets
             qt_version: 6.11.1
             soc: Apple
             type: Release
@@ -308,10 +303,8 @@ jobs:
             cmake_generator: Ninja
             make_package: 1
             package_suffix: "-macOS15"
-            # Read https://aqtinstall.readthedocs.io/en/latest/getting_started.html#installing-a-subset-of-qt-archives-advanced
-            # and check https://ddalcino.github.io/aqt-list-server/
-            qt_archives: qtbase qtdeclarative qtsvg qttools qttranslations
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations
+            qt_modules: qtwebsockets
             qt_version: 6.11.1
             soc: Apple
             type: Release
@@ -324,10 +317,8 @@ jobs:
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
-            # Read https://aqtinstall.readthedocs.io/en/latest/getting_started.html#installing-a-subset-of-qt-archives-advanced
-            # and check https://ddalcino.github.io/aqt-list-server/
-            qt_archives: qtbase qtdeclarative qtsvg qttools qttranslations
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations
+            qt_modules: qtwebsockets
             qt_version: 6.11.1
             soc: Apple
             type: Debug
@@ -342,10 +333,8 @@ jobs:
             cmake_generator_platform: x64
             make_package: 1
             package_suffix: "-Win10"
-            # Read https://aqtinstall.readthedocs.io/en/latest/getting_started.html#installing-a-subset-of-qt-archives-advanced
-            # and check https://ddalcino.github.io/aqt-list-server/
-            qt_archives: qtbase qtsvg qttools qttranslations
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations
+            qt_modules: qtwebsockets
             qt_version: 6.11.1
             type: Release
 
@@ -372,7 +361,6 @@ jobs:
 
       - name: "[macOS] Setup ccache"
         if: matrix.os == 'macOS' && matrix.use_ccache == 1
-        shell: bash
         run: brew install ccache
 
       - name: "[macOS] Restore compiler cache (ccache)"
@@ -387,7 +375,6 @@ jobs:
           restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
 
       - name: "Install aqtinstall"
-        shell: bash
         run: pipx install aqtinstall
 
       # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
@@ -398,40 +385,13 @@ jobs:
         shell: bash
         run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"
 
-      - name: "List available Qt archives (aqtinstall)"
-        shell: bash
-        run: |
-          echo "Archives (Mac):"
-          aqt list-qt mac desktop --archives ${{ steps.resolve_qt_version.outputs.version }} clang_64
-          echo ""
-          echo "Archives (Windows):"
-          aqt list-qt windows desktop --archives 6.10.3 win64_msvc2022_64
-
-      - name: "List available Qt modules (aqtinstall)"
-        shell: bash
-        run: |
-          echo "Modules (Mac):"
-          aqt list-qt mac desktop --modules ${{ steps.resolve_qt_version.outputs.version }} clang_64
-          echo ""
-          echo "Modules (Windows):"
-          aqt list-qt windows desktop --modules 6.10.3 win64_msvc2022_64
-
-      - name: "List avaialble Qt tools (aqtinstall)"
-        shell: bash
-        run: |
-          echo "Tools (Mac):"
-          aqt list-tool mac desktop
-          echo ""
-          echo "Tools (Windows):"
-          aqt list-tool windows desktop
-
-     # - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries"
-     #   if: matrix.os == 'macOS'
-     #   id: restore_qt
-     #   uses: actions/cache/restore@v6
-     #   with:
-     #     key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
-     #     path: ${{ github.workspace }}/Qt
+      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries"
+        if: matrix.os == 'macOS'
+        id: restore_qt
+        uses: actions/cache/restore@v6
+        with:
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
+          path: ${{ github.workspace }}/Qt
 
       # Using jurplel/install-qt-action to install Qt without using brew
       # Qt build using vcpkg either just fails or takes too long to build
@@ -447,7 +407,6 @@ jobs:
 
       - name: "[macOS] Create thin Qt libraries"
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
-        shell: bash
         run: .ci/thin_macos_qtlib.sh
 
       - name: "[macOS] Cache thin Qt libraries"
@@ -507,7 +466,6 @@ jobs:
       - name: "[macOS] Delete remote compiler cache (ccache)"
         if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
         continue-on-error: true
-        shell: bash
         env:
           CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
           GH_TOKEN: ${{ github.token }}
@@ -526,7 +484,6 @@ jobs:
       - name: "[macOS] Sign app bundle"
         if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
         id: sign_macos
-        shell: bash
         env:
           BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
@@ -540,7 +497,6 @@ jobs:
 
       - name: "[macOS] Notarize app bundle"
         if: matrix.os == 'macOS' && steps.sign_macos.outcome == 'success'
-        shell: bash
         env:
           BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}