diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs
index 8dc2d3a3f1..3a8977e83f 100644
--- a/assets/wix/Product.wxs
+++ b/assets/wix/Product.wxs
@@ -1,6 +1,4 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <!-- MSI installs on Win7 and above -->
-  <?define MinOSVersionSupported = "VersionNT >= 601" ?>
   <!-- The URL for add/remove programs -->
   <!-- TBD:Point to the actual release -->
   <?define InfoURL="https://github.com/PowerShell/PowerShell" ?>
@@ -135,8 +133,11 @@
       <Publish Dialog="MyExitDialog" Control="Finish" Order="1" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT=1</Publish>
     </UI>
     <!-- Prerequisites -->
-    <Condition Message="Supported only on Windows 7 and above">
-      <![CDATA[ Installed OR $(var.MinOSVersionSupported) ]]>
+    <Condition Message="Supported only on Windows 8.1 and above">
+      <![CDATA[ Installed OR MsiNTProductType <> 1 OR VersionNT >= 603 ]]>
+    </Condition>
+    <Condition Message="Supported only on Windows Server 2012 and above">
+      <![CDATA[ Installed OR MsiNTProductType = 1 OR VersionNT >= 602 ]]>
     </Condition>
     <!-- Information About When Older Versions Are Trying To Be Installed-->
     <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of $(var.ProductName) is already installed." />