diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 56aa8aa6..c61103d9 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -7,7 +7,7 @@
 
     <_AlternativeVCTargetsPath170>$(ExtractedFolder)VCTargets170\</_AlternativeVCTargetsPath170>
     <_AlternativeVCTargetsPath160>$(ExtractedFolder)VCTargets160\</_AlternativeVCTargetsPath160>
-    <_AlternativeVCTargetsPath150>$(ExtractedFolder)VCTargets150\</_AlternativeVCTargetsPath150>
+    <_AlternativeVCTargetsPath150 Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &lt; '241000'">$(ExtractedFolder)VCTargets150\</_AlternativeVCTargetsPath150>
 
     <!-- Workaround for VS bug -->
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
diff --git a/build/SetupBWOI.targets b/build/SetupBWOI.targets
index e2b45111..893026be 100644
--- a/build/SetupBWOI.targets
+++ b/build/SetupBWOI.targets
@@ -16,9 +16,6 @@
       If any of these folders is not present then we assume that the VCTargets has not been setup
   -->
   <ItemGroup>
-    <BWOIVCFolders Include="$(ExtractedFolder)VCTargets150\" />
-    <BWOIVCFolders Include="$(ExtractedFolder)VCTargets150\Platforms\" />
-    <BWOIVCFolders Include="$(ExtractedFolder)VCTargets150\Platforms\gaming.desktop.x64" />
     <BWOIVCFolders Include="$(ExtractedFolder)VCTargets160\" />
     <BWOIVCFolders Include="$(ExtractedFolder)VCTargets160\Platforms\" />
     <BWOIVCFolders Include="$(ExtractedFolder)VCTargets160\Platforms\gaming.desktop.x64" />
@@ -93,16 +90,16 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
         Text="Only supports VS 2019 or VS 2022" />
 
     <!-- Set up files for v141 platform toolset projects -->
-    <ItemGroup>
+    <ItemGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
       <SourceVCTargetsFilesV150 Include="$(MSBuildExtensionsPath32)\Microsoft\VC\v150\**" />
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
       <GDKVCTargetsFilesV150 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
     </ItemGroup>
 
-    <Copy SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV150)" DestinationFolder="$(ExtractedFolder)VCTargets150\%(RecursiveDir)/" />
-    <Copy SourceFiles="@(GDKVCTargetsFilesV150)" DestinationFolder="$(ExtractedFolder)VCTargets150\%(RecursiveDir)/" />
+    <Copy Condition="'$(GDKEditionNumber)' &lt; '241000'" SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV150)" DestinationFolder="$(ExtractedFolder)VCTargets150\%(RecursiveDir)/" />
+    <Copy Condition="'$(GDKEditionNumber)' &lt; '241000'" SourceFiles="@(GDKVCTargetsFilesV150)" DestinationFolder="$(ExtractedFolder)VCTargets150\%(RecursiveDir)/" />
 
     <!-- Set up files for v142 platform toolset projects -->
     <ItemGroup>
@@ -132,4 +129,3 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
 
   <Target Name="SetupVCTargets" DependsOnTargets="_CheckMSBuild64;_ProbeForExtractedVCTargets;_CreateVCTargetsFolder" />
 </Project>
-