diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index 6dd64e1cc6..b90e537ca2 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -16,7 +16,8 @@
     <PackageReference Include="Microsoft.PowerShell.PSResourceGet" Version="1.1.1" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
     <PackageReference Include="PSReadLine" Version="2.3.6" />
-    <PackageReference Include="ThreadJob" Version="2.0.3" />
+    <PackageReference Include="ThreadJob" Version="2.1.0" />
+    <PackageReference Include="Microsoft.PowerShell.ThreadJob" Version="2.2.0" />   
   </ItemGroup>
 
 </Project>
diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index e52ebed2b1..18b25f019f 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -879,10 +879,6 @@
     "Pattern": "Modules/PSReadLine/*.txt",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "Modules/ThreadJob/*.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "Modules/ThreadJob/*.psd1",
     "FileType": "NonProduct"
@@ -899,10 +895,34 @@
     "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\PSResourceRepository.admx",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\.signature.p7s",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\en-us\\Microsoft.PowerShell.ThreadJob.dll-Help.xml",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\LICENSE",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\ThirdPartyNotices.txt",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "Modules\\PSReadLine\\.signature.p7s",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "Modules\\ThreadJob\\.signature.p7s",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "Modules\\ThreadJob\\ThreadJob.psm1",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "mscordaccore_*.dll",
     "FileType": "NonProduct"
@@ -3471,6 +3491,14 @@
     "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\InstallPSResourceGetPolicyDefinitions.ps1",
     "FileType": "Product"
   },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\Microsoft.PowerShell.ThreadJob.dll",
+    "FileType": "Product"
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\Microsoft.PowerShell.ThreadJob.psd1",
+    "FileType": "Product"
+  },
   {
     "Pattern": "pwsh.dll",
     "FileType": "Product"