diff --git a/eng/Signing.props b/eng/Signing.props
index ae15a17e..0bbc5e60 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -4,16 +4,14 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(RID)' == 'win-x86'">
-    <FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
-    <ItemsToSign Include="$(ArtifactsDir)layout\**\dotnet-core-uninstall.dll;
-      $(ArtifactsDir)layout\**\dotnet-core-uninstall.resources.dll;
-      $(ArtifactsDir)layout\**\dotnet-core-uninstall.exe;
-      $(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi" />
+    <FileExtensionSignInfo Include=".msi;.wixpdb" CertificateName="MicrosoftDotNet500" />
+    <ItemsToSign Include="$(ArtifactsShippingPackagesDir)**\*.wixpack.zip;
+      $(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi;" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
-  <FileSignInfo Include="dotnet-core-uninstall" CertificateName="MacDeveloperHarden" />
-  <FileSignInfo Include="dotnet-core-uninstall.pdb" CertificateName="MacDeveloperHarden" />
+    <FileSignInfo Include="dotnet-core-uninstall" CertificateName="MacDeveloperHarden" />
+    <FileSignInfo Include="dotnet-core-uninstall.pdb" CertificateName="MacDeveloperHarden" />
     <ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/*" />
   </ItemGroup>
 </Project>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 846ded9c..1031db7b 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -9,8 +9,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\dotnet-core-uninstall\dotnet-core-uninstall.csproj" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25124.4"/>
   </ItemGroup>
-  
+
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\Versions.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\BuildCoreSdkTasks.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\GetRuntimeInformation.targets" />
@@ -18,5 +19,4 @@
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\FileExtensions.targets" />
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\GenerateMSIs.targets" />
   <Target Condition="'$(RID)' == 'win-x86'" Name="GenerateMSIs" AfterTargets="Build" DependsOnTargets="GenerateLayout;GenerateDotnetCoreUninstallMsi" />
-
 </Project>
\ No newline at end of file
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 273acb2c..449a873f 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -32,10 +32,10 @@
   <Target Name="MsiTargetsSetupInputOutputs"
           DependsOnTargets="GenerateLayout;SetupWixProperties;GetDotnetCoreUninstallGitCommitInfo">
 
-    <GenerateMsiVersion CommitCount="$(GitCommitCount)"
-                        VersionMajor="$(VersionMajor)"
-                        VersionMinor="$(VersionMinor)"
-                        VersionPatch="$(VersionPatch)">
+    <GenerateMsiVersion BuildNumber="$(GitCommitCount)"
+                        Major="$(VersionMajor)"
+                        Minor="$(VersionMinor)"
+                        Patch="$(VersionPatch)">
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
     </GenerateMsiVersion>
 
@@ -75,7 +75,6 @@
           Inputs="$(DotnetCoreUninstallOutputDirectory)**/*;
                     $(DotnetCoreUninstallGenerateMsiPowershellScript)"
           Outputs="$(DotnetCoreUninstallMSIInstallerFile)">
-
     <Exec Command="powershell -NoProfile -NoLogo $(DotnetCoreUninstallGenerateMsiPowershellScript) ^
                       '$(DotnetCoreUninstallOutputDirectory.TrimEnd('\'))' ^
                       '$(DotnetCoreUninstallMSIInstallerFile)' ^
@@ -85,6 +84,25 @@
                       '$(DotnetCoreUninstallInstallerUpgradeCode)' ^
                       '$(Architecture)' ^
                       -InformationAction Continue" />
+    <PropertyGroup>
+      <!-- Temp directory for light command layouts -->
+      <LightCommandObjDir>$(ArtifactsObjDir)/LightCommandPackages</LightCommandObjDir>
+      <!-- Directory for the zipped up light command package -->
+      <LightCommandPackagesDir>$(ArtifactsShippingPackagesDir)</LightCommandPackagesDir>
+    </PropertyGroup>
+    <ItemGroup>
+        <UninstallerMsiWixSrcFiles Include="$(WixRoot)\*.wixobj" />
+    </ItemGroup>
+    <CreateLightCommandPackageDrop
+      LightCommandWorkingDir="$(LightCommandObjDir)"
+      OutputFolder="$(LightCommandPackagesDir)"
+      AdditionalBasePaths="$(MSBuildThisFileDirectory)/packaging/windows/dotnetCoreUninstall"
+      Cultures="en-us" 
+      InstallerFile="$(DotnetCoreUninstallMSIInstallerFile)"
+      WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
+      WixSrcFiles="@(UninstallerMsiWixSrcFiles)">
+      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
+    </CreateLightCommandPackageDrop>
   </Target>
 
 </Project>