diff --git a/.github/workflows/dotnet_provisioner_unit_tests.yml b/.github/workflows/dotnet_provisioner_unit_tests.yml
index 0149f7a37..c35ea9181 100644
--- a/.github/workflows/dotnet_provisioner_unit_tests.yml
+++ b/.github/workflows/dotnet_provisioner_unit_tests.yml
@@ -80,6 +80,35 @@ jobs:
           fi
           echo "::set-output name=result::$result"
           more $logName
+          
+      - name: Install packaging tools
+        working-directory: HIRS_Provisioner.NET/hirs
+        run: |
+          dotnet tool install --global dotnet-deb
+          dotnet tool install --global dotnet-rpm
+          dotnet tool install --global wix
+      
+      - name: Run packaging tools
+        if: contains(matrix.os, 'ubuntu')
+        working-directory: HIRS_Provisioner.NET/hirs
+        run: |
+          dotnet deb -r linux-x64 -c Release
+          dotnet rpm -r linux-x64 -c Release
+          
+      - name: Run packaging tools
+        if: contains(matrix.os, 'windows')
+        working-directory: HIRS_Provisioner.NET/hirs
+        run: |
+          dotnet deb -r linux-x64 -c Release
+          dotnet rpm -r linux-x64 -c Release 
+          dotnet build HIRS_Provisioner.NET.wixproj -r win-x64 -c Release
+
+      - name: Setup tmate session on error
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+        timeout-minutes: 30 # The ssh session will be available for 2 minutes.
+        with:
+          limit-access-to-actor: true # Only the person who pushed can access- with a github-registered key.          
 
       - name: Upload Logs Ubuntu
         uses: actions/upload-artifact@v2
diff --git a/HIRS_Provisioner.NET/hirs/Directory.Build.targets b/HIRS_Provisioner.NET/hirs/Directory.Build.targets
index 6d1615f52..72b1c8a0c 100644
--- a/HIRS_Provisioner.NET/hirs/Directory.Build.targets
+++ b/HIRS_Provisioner.NET/hirs/Directory.Build.targets
@@ -12,19 +12,10 @@
     </PropertyGroup>
     <Message Text="Set installed directory prefix to $(PREFIX)." Importance="high" />
   </Target>
-  <Target Name="RenameBeforePublishWindows" BeforeTargets="SetWixPath" Condition="$(RuntimeIdentifier.Contains('win'))">
+  <Target Name="RenameBeforePublishWindows" BeforeTargets="CreatePackageProperties" Condition="$(RuntimeIdentifier.Contains('win'))">
     <Move SourceFiles="$(OUTDIR)publish\$(AssemblyName).exe" DestinationFiles="$(OUTDIR)publish\tpm_aca_provision.exe" />
     <Message Text="Renamed exe binary file." Importance="high" />
   </Target>
-  <Target Name="SetWixPath" BeforeTargets="Msi">
-    <PropertyGroup>
-      <ProductSourceFilePath>$(MSBuildThisFileDirectory)\Resources\Product.wxs</ProductSourceFilePath>
-      <WixInstallPath>$(NuGetPackageRoot)wix\3.11.2\tools\</WixInstallPath>
-      <Heat>$(WixInstallPath)heat.exe</Heat>
-      <Candle>$(WixInstallPath)candle.exe</Candle>
-      <Light>$(WixInstallPath)light.exe</Light>
-    </PropertyGroup>
-  </Target>
   <Target Name="DeletePDB" AfterTargets="RenameBeforePublishLinux;RenameBeforePublishWindows">
     <ItemGroup>
       <PDBToDelete Include="$(PublishDir)*.pdb"/>
diff --git a/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.wixproj b/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.wixproj
new file mode 100644
index 000000000..271a6dae8
--- /dev/null
+++ b/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.4">
+  <ItemGroup>
+    <Compile Include="Resources/Product.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file