diff --git a/packaging/windows/registrykeys.wxs b/packaging/windows/registrykeys.wxs
index 89196b7b9..64c5d16e4 100644
--- a/packaging/windows/registrykeys.wxs
+++ b/packaging/windows/registrykeys.wxs
@@ -3,7 +3,9 @@
   <?include "Variables.wxi" ?>
   <Fragment>
     <ComponentGroup Id="AuthoredRegistryKeys">
-      <Component Directory="TARGETDIR" Guid="*" Win64="$(var.Win64AttributeValue)">
+	  <!--Need this to set the reg keys for both x64 and x86 from the x64 installer-->
+	  <?if $(var.Platform) = x64?>
+      <Component Id="SetupRegistry_x64" Directory="TARGETDIR" Guid="*" Win64="yes">
         <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup">
           <RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
           <RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
@@ -11,6 +13,19 @@
         </RegistryKey>
         <Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" />
         <Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" />
+      </Component>
+	  <?endif?>
+	  <Component Id="SetupRegistry_x86" Directory="TARGETDIR" Guid="*" Win64="no">
+        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup">
+          <RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
+          <RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
+          <RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
+        </RegistryKey>
+		<!--In case of x64 installer these env vars are already set above-->
+		<?if $(var.Platform) = x86?>
+        <Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" />
+        <Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" />
+		<?endif?>
       </Component>
     </ComponentGroup>
   </Fragment>