diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 527bc988c..636f6d720 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -318,8 +318,12 @@
 
     <!-- Choose "latest" template MSI to go in bundle. -->
     <ItemGroup>
+      <!-- While we don't have 8.0 templates available (need SDK update, choose the 7.0 templates -->
+      <!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
+                                        Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
       <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
                                         Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
+                                        Condition="'%(TemplatesMajorMinorVersion)' == '7.0'"/>
     </ItemGroup>
     <PropertyGroup>
       <LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>