diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index f941a43236..31acf139a5 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -1,4 +1,4 @@
-name: C/C++ CI
+name: Build Windows
 
 on:
   push:
@@ -14,7 +14,7 @@ jobs:
     - name: Install 3rdp dependencies
       run: ./scripts/update-3rdp.bat
     - name: Generate build files
-      run: ./scripts/build-projects-fbuild-win64.bat
+      run: ./scripts/build-projects-vs2022-win64.bat
     - name: Build DebugShared
       run: ./scripts/autobuild/autobuild-latest-win64.bat DebugShared
     - name: Build ReleaseShared
diff --git a/scripts/autobuild/autobuild-latest-win64.bat b/scripts/autobuild/autobuild-latest-win64.bat
index 21e1423987..0e1c32840c 100755
--- a/scripts/autobuild/autobuild-latest-win64.bat
+++ b/scripts/autobuild/autobuild-latest-win64.bat
@@ -1,7 +1,7 @@
 @echo off
 
 set CONFIG=%*
-if "%CONFIG%" == "" ( set CONFIG=all )
+if "%CONFIG%" neq "" ( set CONFIG="/p:Configuration=%CONFIG%" )
 
 :: Setup our build environment.
 call "%~dp0..\config.bat"
@@ -9,6 +9,5 @@ call "%~dp0..\config-vs-x64.bat"
 
 :: Rebuild entire solution.
 pushd "%TRAKTOR_HOME%\build\win64"
-%FBUILD% -config "Extern Win64.bff" -noprogress -summary -cache %CONFIG%
-%FBUILD% -config "Traktor Win64.bff" -noprogress -summary -cache %CONFIG%
+msbuild -m "Traktor Win64.sln" %CONFIG%
 popd
diff --git a/scripts/misc/update-3rdp.run b/scripts/misc/update-3rdp.run
index 281321cba4..29deeb96fd 100644
--- a/scripts/misc/update-3rdp.run
+++ b/scripts/misc/update-3rdp.run
@@ -1,6 +1,6 @@
 --[[
  TRAKTOR
- Copyright (c) 2022 Anders Pistol.
+ Copyright (c) 2022-2024 Anders Pistol.
 
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -439,39 +439,6 @@ local PACKAGES =
 		end
 	},
 
-	-- FastBUILD
-	{
-		type = "GET",
-		name = "fastbuild-windows",
-		os = "windows",
-		url = "https://fastbuild.org/downloads/v1.07/FASTBuild-Windows-x64-v1.07.zip",
-		patch = function()
-			run:execute(UNZIP .. " -qq FASTBuild-Windows-x64-v1.07.zip")
-		end
-	},
-
-	-- Ninja
-	{
-		type = "GET",
-		name = "ninja-windows",
-		os = "windows",
-		url = "https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-win.zip",
-		patch = function()
-			run:execute(UNZIP .. " -qq ninja-win.zip")
-		end		
-	},
-
-	-- JOM
-	{
-		type = "GET",
-		name = "jom-windows",
-		os = "windows",
-		url = "http://download.qt.io/official_releases/jom/jom.zip",
-		patch = function()
-			run:execute(UNZIP .. " -qq jom.zip")
-		end		
-	},
-
 	-- Lemon
 	{
 		type = "GIT",