diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1
index 5bae4cd8154f..33fc7c8ee92b 100644
--- a/tools/Gen2Master/MoveFromGeneration2Master.ps1
+++ b/tools/Gen2Master/MoveFromGeneration2Master.ps1
@@ -157,7 +157,7 @@ Function Move-Generation2Master {
             New-Item "$DestPath\$ModuleName\Properties" -ItemType Directory
             # Copy the assemblyinfo file
             Copy-Template -SourceName AssemblyInfo.cs -DestPath "$DestPath\$ModuleName\Properties" -DestName AssemblyInfo.cs -ModuleName $submoduleName
-            
+            Update-MappingJson $ModuleName
         }
         # update module page
         dotnet build $slnFilePath
@@ -196,7 +196,7 @@ Function Move-Generation2Master {
                     }
                 }
                 Write-Host "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1"
-                & "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1" -ModuleName $ModuleName -Psd1Folder "$DestPath/$ModuleName$Psd1FolderPostfix"
+                & "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1" -ModuleName $ModuleName -ArtifactFolder "$DestPath\..\..\artifacts" -Psd1Folder "$DestPath/$ModuleName$Psd1FolderPostfix"
             }
             else
             {
diff --git a/tools/ResolveTools/Resolve-Psd1.ps1 b/tools/ResolveTools/Resolve-Psd1.ps1
index 9120da5ef3a1..b124634b1c60 100644
--- a/tools/ResolveTools/Resolve-Psd1.ps1
+++ b/tools/ResolveTools/Resolve-Psd1.ps1
@@ -14,16 +14,18 @@
 
 # This will resolve the issues in root module psd1 file of every Az module
 # ```powershell
-# ./tools/ResolveTools/Resolve-Psd1.ps1 -Module ManagedServiceIdentity -Psd1Folder src/ManagedServiceIdentity/ManagedServiceIdentity
+# ./tools/ResolveTools/Resolve-Psd1.ps1 -Module ManagedServiceIdentity -ArtifactFolder ./artifacts -Psd1Folder src/ManagedServiceIdentity/ManagedServiceIdentity
 # ```
 
 Param(
     [Parameter(Mandatory = $true)]
     [string] $ModuleName,
     [Parameter(Mandatory = $true)]
+    [string] $ArtifactFolder,
+    [Parameter(Mandatory = $true)]
     [string] $Psd1Folder
 )
-Import-Module "$PSScriptRoot/../../artifacts/Debug/Az.$ModuleName/Az.$ModuleName.psd1" -Force
+Import-Module "$ArtifactFolder/Debug/Az.$ModuleName/Az.$ModuleName.psd1" -Force
 $HelpFolder = "$Psd1Folder/help"
 $ModuleMatadata = Get-Module "Az.$ModuleName"