diff --git a/configuration.dsc.yaml b/_wdk_utils/winget/configs/configuration.dsc.yaml
similarity index 70%
rename from configuration.dsc.yaml
rename to _wdk_utils/winget/configs/configuration.dsc.yaml
index 3d25ff064..5d8c32f23 100644
--- a/configuration.dsc.yaml
+++ b/_wdk_utils/winget/configs/configuration.dsc.yaml
@@ -4,10 +4,10 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio 2022 Community
+        description: Install Visual Studio Community
         allowPrerelease: true
       settings:
-        id: Microsoft.VisualStudio.2022.Community
+        id: Microsoft.VisualStudio.Community
         source: winget
         useLatest: true
     - resource: Microsoft.VisualStudio.DSC/VSComponents
@@ -18,38 +18,37 @@ properties:
         description: Install required VS workloads and components
       settings:
         productId: Microsoft.VisualStudio.Product.Community
-        channelId: VisualStudio.17.Release
+        channelId: VisualStudio.18.Release
         includeRecommended: false
         components:
-          - Microsoft.VisualStudio.Component.VC.CoreBuildTools
-          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
-          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
-          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
-          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
-          - Microsoft.VisualStudio.Component.Windows10SDK
-          - Microsoft.VisualStudio.Component.VC.ATL
-          - Microsoft.VisualStudio.Component.VC.ATL.ARM64
-          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
+          - Component.Microsoft.Windows.DriverKit
+          - Microsoft.Component.MSBuild
+          - Microsoft.VisualStudio.Component.CoreEditor
+          - Microsoft.VisualStudio.Component.DiagnosticTools
+          - Microsoft.VisualStudio.Component.Roslyn.Compiler
+          - Microsoft.VisualStudio.Component.TextTemplating
           - Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.ATLMFC
+          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
           - Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre
-          - Microsoft.VisualStudio.Component.VC.ASAN
-          - Microsoft.VisualStudio.Component.NuGet.BuildTools
-          - Microsoft.VisualStudio.Component.VC.MFC.ARM64
+          - Microsoft.VisualStudio.Component.VC.CoreIde
           - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
+          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
+          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
+          - Microsoft.VisualStudio.Workload.CoreEditor
           - Microsoft.VisualStudio.Workload.NativeDesktop
-          - Component.Microsoft.Windows.DriverKit
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: sdkPackage
       directives:
-        description: Install Windows SDK version 26100
+        description: Install Windows SDK version 28000
         allowPrerelease: true
       settings:
-        id: Microsoft.WindowsSDK.10.0.26100
+        id: Microsoft.WindowsSDK.10.0.28000
         source: winget
         useLatest: true
     - resource: Microsoft.WinGet.DSC/WinGetPackage
@@ -57,10 +56,10 @@ properties:
       dependsOn:
         - sdkPackage
       directives:
-        description: Install Windows Driver Kit version 26100
+        description: Install Windows Driver Kit version 28000
         allowPrerelease: true
       settings:
-        id: Microsoft.WindowsWDK.10.0.26100
+        id: Microsoft.WindowsWDK.10.0.28000
         source: winget
         useLatest: true
   configurationVersion: 0.2.1
diff --git a/_wdk_utils/winget/configs/wdk-desktop.vsconfig b/_wdk_utils/winget/configs/wdk-desktop.vsconfig
new file mode 100644
index 000000000..92b73d045
--- /dev/null
+++ b/_wdk_utils/winget/configs/wdk-desktop.vsconfig
@@ -0,0 +1,27 @@
+{
+  "version": "1.0",
+  "components": [
+    "Component.Microsoft.Windows.DriverKit",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.VisualStudio.Component.CoreEditor",
+    "Microsoft.VisualStudio.Component.DiagnosticTools",
+    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+    "Microsoft.VisualStudio.Component.TextTemplating",
+    "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.ATL.Spectre",
+    "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre",
+    "Microsoft.VisualStudio.Component.VC.CoreIde",
+    "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
+    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre",
+    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
+    "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Workload.NativeDesktop"
+  ],
+  "extensions": []
+}
\ No newline at end of file
diff --git a/configuration_vsonly.dsc.yaml b/configuration_vsonly.dsc.yaml
deleted file mode 100644
index 9d86a4f74..000000000
--- a/configuration_vsonly.dsc.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-properties:
-  resources:
-    - resource: Microsoft.WinGet.DSC/WinGetPackage
-      id: vsPackage
-      directives:
-        description: Install Visual Studio 2022 Community
-        allowPrerelease: true
-      settings:
-        id: Microsoft.VisualStudio.2022.Community
-        source: winget
-        useLatest: true
-    - resource: Microsoft.VisualStudio.DSC/VSComponents
-      id: vsComponents
-      dependsOn:
-        - vsPackage
-      directives:
-        description: Install required VS workloads and components
-      settings:
-        productId: Microsoft.VisualStudio.Product.Community
-        channelId: VisualStudio.17.Release
-        includeRecommended: false
-        components:
-          - Microsoft.VisualStudio.Component.VC.CoreBuildTools
-          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
-          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
-          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
-          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
-          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
-          - Microsoft.VisualStudio.Component.Windows10SDK
-          - Microsoft.VisualStudio.Component.VC.ATL
-          - Microsoft.VisualStudio.Component.VC.ATL.ARM64
-          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
-          - Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre
-          - Microsoft.VisualStudio.Component.VC.ATLMFC
-          - Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre
-          - Microsoft.VisualStudio.Component.VC.ASAN
-          - Microsoft.VisualStudio.Component.NuGet.BuildTools
-          - Microsoft.VisualStudio.Component.VC.MFC.ARM64
-          - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
-          - Microsoft.VisualStudio.Workload.NativeDesktop
-          - Component.Microsoft.Windows.DriverKit
-  configurationVersion: 0.2.1