diff --git a/.nuspec/Microsoft.Maui.Controls.SingleProject.targets b/.nuspec/Microsoft.Maui.Controls.SingleProject.targets
index 0ac60c024eb9..693376d9db72 100644
--- a/.nuspec/Microsoft.Maui.Controls.SingleProject.targets
+++ b/.nuspec/Microsoft.Maui.Controls.SingleProject.targets
@@ -4,6 +4,8 @@
 
     <PlatformsProjectFolder Condition=" '$(PlatformsProjectFolder)' == '' ">Platforms\</PlatformsProjectFolder>
 
+    <!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->
+    <_KeepLaunchProfiles>true</_KeepLaunchProfiles>
     <!-- Android -->
     <EnableDefaultAndroidItems>false</EnableDefaultAndroidItems>
     <AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">$(PlatformsProjectFolder)Android\</AndroidProjectFolder>
@@ -68,5 +70,9 @@
   <ItemGroup Condition=" '$(SingleProject)' == 'true' ">
     <ProjectCapability Include="MauiSingleProject" />
     <ProjectCapability Include="LaunchProfiles" />
+    <!-- If VS is older than Dev17 -->
+    <ProjectCapability Include="XamarinStaticLaunchProfiles" Condition=" '$(VisualStudioVersion)' != '' and '$(VisualStudioVersion)' &lt; '17.0' " />
+    <!-- Otherwise define LaunchProfilesGroupByPlatformFilters by default -->
+    <ProjectCapability Include="LaunchProfilesGroupByPlatformFilters" Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &gt;= '17.0' " />
   </ItemGroup>
 </Project>
diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj
index a35895663dc1..120358c298e3 100644
--- a/src/DotNet/DotNet.csproj
+++ b/src/DotNet/DotNet.csproj
@@ -57,7 +57,7 @@
       <_WorkloadFiles Include="$(_InstallTempDirectory)data/WorkloadManifest.*" />
     </ItemGroup>
     <CopyWorkloadFiles
-        Name="Microsoft.NET.Sdk.Maui"
+        Name="microsoft.net.sdk.maui"
         Files="@(_WorkloadFiles)"
         WorkloadDirectory="$(MSBuildExtensionsPath)../../sdk-manifests/$(DotNetPreviewVersionBand)"
         VersionBand="$(DotNetPreviewVersionBand)"
diff --git a/src/Templates/src/templates/maui-blazor/Directory.Build.targets b/src/Templates/src/templates/maui-blazor/Directory.Build.targets
deleted file mode 100644
index fa64a8926d23..000000000000
--- a/src/Templates/src/templates/maui-blazor/Directory.Build.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->
-    <_KeepLaunchProfiles>true</_KeepLaunchProfiles>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Required - Setup Single Project features -->
-    <ProjectCapability Include="MauiSingleProject" />
-
-    <!-- Optional - Enables a list of TFM's and device categories in the debug menu -->
-    <!-- This allows easily toggling of debug target TFM by selecting the platform -->
-    <!-- If removed, Top level debug targets show as a list of devices for the selected TFM -->
-    <ProjectCapability Include="XamarinStaticLaunchProfiles" />
-  </ItemGroup>
-
-  <!-- Required - Overwrite tasks that are not needed when multitargeting -->
-  <Target Name="ValidateWinUIPlatform" />
-  <Target Name="BinPlaceBootstrapDll" />
-
-</Project>
diff --git a/src/Templates/src/templates/maui-mobile/Directory.Build.targets b/src/Templates/src/templates/maui-mobile/Directory.Build.targets
deleted file mode 100644
index fa64a8926d23..000000000000
--- a/src/Templates/src/templates/maui-mobile/Directory.Build.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->
-    <_KeepLaunchProfiles>true</_KeepLaunchProfiles>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Required - Setup Single Project features -->
-    <ProjectCapability Include="MauiSingleProject" />
-
-    <!-- Optional - Enables a list of TFM's and device categories in the debug menu -->
-    <!-- This allows easily toggling of debug target TFM by selecting the platform -->
-    <!-- If removed, Top level debug targets show as a list of devices for the selected TFM -->
-    <ProjectCapability Include="XamarinStaticLaunchProfiles" />
-  </ItemGroup>
-
-  <!-- Required - Overwrite tasks that are not needed when multitargeting -->
-  <Target Name="ValidateWinUIPlatform" />
-  <Target Name="BinPlaceBootstrapDll" />
-
-</Project>
diff --git a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/Microsoft.Maui.Controls.Sdk.After.targets b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/Microsoft.Maui.Controls.Sdk.After.targets
index 7972e576c296..66a8d0527b22 100644
--- a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/Microsoft.Maui.Controls.Sdk.After.targets
+++ b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/Microsoft.Maui.Controls.Sdk.After.targets
@@ -12,4 +12,11 @@
     <Analyzer Include="$(MSBuildThisFileDirectory)../targets/Microsoft.Maui.Controls.Xaml.dll" />
     <Analyzer Include="$(MSBuildThisFileDirectory)../targets/Microsoft.Maui.Controls.SourceGen.dll" />
   </ItemGroup>
+  <!-- @(ProjectCapability) used to identify parts of Maui -->
+  <ItemGroup>
+    <ProjectCapability Include="MauiAssets"     Condition=" '$(UseMaui)' == 'true' or '$(UseMauiAssets)' == 'true' " />
+    <ProjectCapability Include="MauiBlazor"     Condition=" '$(UsingMicrosoftNETSdkRazor)' == 'true' " />
+    <ProjectCapability Include="MauiCore"       Condition=" '$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true' " />
+    <ProjectCapability Include="MauiEssentials" Condition=" '$(UseMaui)' == 'true' or '$(UseMauiEssentials)' == 'true' " />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.SingleProject.targets b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.SingleProject.targets
new file mode 100644
index 000000000000..09740d71cdec
--- /dev/null
+++ b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.SingleProject.targets
@@ -0,0 +1,6 @@
+<!-- Workarounds for WinUI when $(SingleProject) is true -->
+<Project>
+  <!-- Required - Overwrite tasks that are not needed when multitargeting -->
+  <Target Name="ValidateWinUIPlatform" />
+  <Target Name="BinPlaceBootstrapDll" />
+</Project>
diff --git a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.targets b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.targets
index 4f4f670936e5..07027babd3b2 100644
--- a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.targets
+++ b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/WinUI.targets
@@ -8,4 +8,5 @@
       />
     </ItemGroup>
   </Target>
+  <Import Project="WinUI.SingleProject.targets" Condition=" '$(SingleProject)' == 'true' " />
 </Project>