diff --git a/tools/Az.Tools.Predictor/build.proj b/tools/Az.Tools.Predictor/build.proj
index 11a3ab126a6b..ba9fc36d56bb 100644
--- a/tools/Az.Tools.Predictor/build.proj
+++ b/tools/Az.Tools.Predictor/build.proj
@@ -44,6 +44,6 @@
 
   <Target Name="Package" Condition="'$(Configuration)' == 'Release'">
     <Message Text="Package $(ModuleName)" />
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;$(RepoTools)/PublishToolsModule.ps1 -RepositoryLocation $(ArtifactFolder) -ModuleName $(ModuleName)&quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;$(RepoTools)/PublishToolsModule.ps1 -RepositoryLocation $(ArtifactFolder) -PublishLocation $(ArtifactFolder) -ModuleName $(ModuleName)&quot;" />
   </Target>
 </Project>
diff --git a/tools/PublishToolsModule.ps1 b/tools/PublishToolsModule.ps1
index 5fb73edbb8c9..a506cceaa1b5 100644
--- a/tools/PublishToolsModule.ps1
+++ b/tools/PublishToolsModule.ps1
@@ -11,12 +11,21 @@ param(
     [string]$ModuleName,
 
     [Parameter(Mandatory = $true)]
-    [string]$RepositoryLocation
+    [string]$RepositoryLocation,
+
+    [Parameter(Mandatory = $true)]
+    [string]$PublishLocation
 )
+
+Import-Module "$PSScriptRoot\PublishModules.psm1"
+
 try {
     $tempRepoName = ([System.Guid]::NewGuid()).ToString()
-    Register-PSRepository -Name $tempRepoName -SourceLocation $RepositoryLocation -PublishLocation $RepositoryLocation -InstallationPolicy Trusted -PackageManagementProvider NuGet
+    Register-PSRepository -Name $tempRepoName -SourceLocation $RepositoryLocation -PublishLocation $PublishLocation -InstallationPolicy Trusted -PackageManagementProvider NuGet
     $modulePath = Join-Path $RepositoryLocation $ModuleName -Resolve
+
+    Save-PackagesFromPsGallery -TempRepo $tempRepoName -TempRepoPath $RepositoryLocation -ModulePaths $modulePath
+
     Publish-Module -Path $modulePath -Repository $tempRepoName -Force
 } catch {
     $Errors = $_