diff --git a/CMakePresets.json b/CMakePresets.json
index 09a1b0141e..275c9a702f 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -26,30 +26,55 @@
             "hidden": true
         },
         {
-            "name": "WIN32",
-            "architecture": {
-                "value": "x64",
-                "strategy": "set"
-            },
+            "name": "WINDOWS",
             "cacheVariables": {
                 "USE_QT": {
                     "type": "BOOL",
                     "value": "ON"
+                },
+                "BUILD_PSFPLAYER": {
+                    "type": "BOOL",
+                    "value": "ON"
                 }
             },
             "hidden": true
         },
         {
-            "name": "win32-vs",
+            "name": "WINDOWS_X86-32",
+            "inherits": "WINDOWS",
+            "architecture": {
+                "value": "Win32",
+                "strategy": "set"
+            },
+            "hidden": true
+        },
+        {
+            "name": "WINDOWS_X86-64",
+            "inherits": "WINDOWS",
+            "architecture": {
+                "value": "x64",
+                "strategy": "set"
+            },
+            "hidden": true
+        },
+        {
+            "name": "windows_x86-32_vs",
+            "inherits": [
+                "WINDOWS_X86-32",
+                "VS"
+            ]
+        },
+        {
+            "name": "windows_x86-64_vs",
             "inherits": [
-                "WIN32",
+                "WINDOWS_X86-64",
                 "VS"
             ]
         },
         {
-            "name": "win32-vs-debugger",
+            "name": "windows_debugger_x86-64_vs",
             "inherits": [
-                "WIN32",
+                "WINDOWS_X86-64",
                 "VS",
                 "DEBUGGER"
             ]
@@ -57,8 +82,8 @@
     ],
     "buildPresets": [
         {
-            "name": "win32-vs",
-            "configurePreset": "win32-vs",
+            "name": "windows_x86-64_vs",
+            "configurePreset": "windows_x86-64_vs",
             "configuration": "RelWithDebInfo",
             "targets": [
                 "Play",
@@ -66,11 +91,11 @@
             ]
         },
         {
-            "name": "win32-vs-debugger",
-            "configurePreset": "win32-vs-debugger",
+            "name": "windows_debugger_x86-64_vs",
+            "configurePreset": "windows_debugger_x86-64_vs",
             "targets": [
                 "Play"
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/build_cmake/generate_vs2022_64.cmd b/build_cmake/generate_vs2022_64.cmd
index bd30294d80..55f1e7585e 100644
--- a/build_cmake/generate_vs2022_64.cmd
+++ b/build_cmake/generate_vs2022_64.cmd
@@ -1,5 +1,2 @@
 @echo off
-mkdir build_vs2022
-pushd build_vs2022
-cmake ../.. -G "Visual Studio 17 2022" -A x64 -DUSE_QT=on -DBUILD_LIBRETRO_CORE=yes -DBUILD_PSFPLAYER=on -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64"
-popd
+cmake .. --preset windows_x86-64_vs -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64"
diff --git a/build_cmake/generate_vs2022_64_debugger.cmd b/build_cmake/generate_vs2022_64_debugger.cmd
index 87c90db919..0c7f8001a3 100644
--- a/build_cmake/generate_vs2022_64_debugger.cmd
+++ b/build_cmake/generate_vs2022_64_debugger.cmd
@@ -1,5 +1,2 @@
 @echo off
-mkdir build_debugger_vs2022
-pushd build_debugger_vs2022
-cmake ../.. -G "Visual Studio 17 2022" -A x64 -DUSE_QT=on -DBUILD_PSFPLAYER=on -DDEBUGGER_INCLUDED=on -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64"
-popd
+cmake .. --preset windows_debugger_x86-64_vs -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64"