diff --git a/.ci/compile.sh b/.ci/compile.sh
index ee846897b..5b4547a82 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -250,11 +250,6 @@ if [[ $RUNNER_OS == macOS ]]; then
     chmod +x "$hdiutil_script"
     flags+=(-DCPACK_COMMAND_HDIUTIL="$hdiutil_script")
   fi
-
-elif [[ $RUNNER_OS == Windows ]]; then
-  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  buildflags+=(-- -p:UseMultiToolTask=true -p:EnableClServerMode=true)
 fi
 
 if [[ $USE_CCACHE ]]; then
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index f1846ecf6..0eaa8ff22 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -266,7 +266,6 @@ jobs:
             runner: macos-15-intel
 
             ccache_eviction_age: 7d
-            cmake_generator: Ninja
             make_package: 1
             override_target: 13
             package_suffix: "-macOS13_Intel"
@@ -282,7 +281,6 @@ jobs:
             runner: macos-14
 
             ccache_eviction_age: 7d
-            cmake_generator: Ninja
             make_package: 1
             package_suffix: "-macOS14"
             qt_version: 6.11.0
@@ -297,7 +295,6 @@ jobs:
             runner: macos-15
 
             ccache_eviction_age: 7d
-            cmake_generator: Ninja
             make_package: 1
             package_suffix: "-macOS15"
             qt_version: 6.11.0
@@ -312,7 +309,6 @@ jobs:
             runner: macos-15
 
             ccache_eviction_age: 7d
-            cmake_generator: Ninja
             qt_version: 6.11.0
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
@@ -324,8 +320,6 @@ jobs:
             target: 10
             runner: windows-2025
 
-            cmake_generator: "Visual Studio 18 2026"
-            cmake_generator_platform: x64
             make_package: 1
             package_suffix: "-Win10"
             qt_version: 6.11.0
@@ -339,6 +333,7 @@ jobs:
     env:
       CCACHE_DIR: ${{ github.workspace }}/.cache/
       CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      CMAKE_GENERATOR: 'Ninja'
 
     steps:
       - name: "Checkout"
@@ -422,7 +417,7 @@ jobs:
       - name: "[Windows] Install NSIS"
         if: matrix.os == 'Windows'
         shell: bash
-        run: choco install nsis
+        run: choco install nsis --no-progress
 
       - name: "Setup vcpkg cache"
         id: vcpkg-cache
@@ -437,8 +432,6 @@ jobs:
         env:
           BUILDTYPE: '${{ matrix.type }}'
           CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
-          CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
-          CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
           DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c10e1db68..13cd1c86e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,7 @@ if(UNIX)
   endif()
 elseif(WIN32)
   set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR})
-  if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(x64)")
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(TRICE_IS_64_BIT 1)
   else()
     set(TRICE_IS_64_BIT 0)