diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 2a5eeb7df..c25659417 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -41,8 +41,8 @@ jobs:
             mingw-w64-ucrt-x86_64-qt5-pdf
             mingw-w64-ucrt-x86_64-sqlite3
             mingw-w64-ucrt-x86_64-pkg-config
-            mingw-w64-ucrt-x86_64-kwidgetsaddons
-            mingw-w64-ucrt-x86_64-kcoreaddons
+            mingw-w64-ucrt-x86_64-kwidgetsaddons-qt5
+            mingw-w64-ucrt-x86_64-kcoreaddons-qt5
             mingw-w64-ucrt-x86_64-extra-cmake-modules
             mingw-w64-ucrt-x86_64-nsis
             mingw-w64-ucrt-x86_64-angleproject
@@ -113,6 +113,7 @@ jobs:
             -DQt5_DIR=/ucrt64/lib/cmake/Qt5 \
             -DQT_VERSION_MAJOR=5 \
             -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON \
+            -DBUILD_KF=OFF \
             -DPACKAGE_TESTS=OFF \
             -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \
             -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
@@ -397,6 +398,9 @@ jobs:
             mingw-w64-ucrt-x86_64-qt6-pdf
             mingw-w64-ucrt-x86_64-sqlite3
             mingw-w64-ucrt-x86_64-pkg-config
+            mingw-w64-ucrt-x86_64-kwidgetsaddons
+            mingw-w64-ucrt-x86_64-kcoreaddons
+            mingw-w64-ucrt-x86_64-extra-cmake-modules
             mingw-w64-ucrt-x86_64-nsis
             mingw-w64-ucrt-x86_64-angleproject
 
@@ -456,7 +460,8 @@ jobs:
             -DCMAKE_PREFIX_PATH=/ucrt64 \
             -DQt6_DIR=/ucrt64/lib/cmake/Qt6 \
             -DQT_VERSION_MAJOR=6 \
-            -DBUILD_WITH_KF=OFF \
+            -DBUILD_WITH_KF=ON \
+            -DBUILD_KF=OFF \
             -DPACKAGE_TESTS=OFF \
             -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \
             -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \