diff --git a/tools/changelog/updateChangelog.ps1 b/tools/changelog/updateChangelog.ps1
index daf0fefd9f..1323e5e1e4 100644
--- a/tools/changelog/updateChangelog.ps1
+++ b/tools/changelog/updateChangelog.ps1
@@ -299,7 +299,7 @@ $cloneParams = @{
     CheckoutBranch = $branchName
     CloneBranch = $PsesBaseBranch
     Clobber = $true
-    Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$vscodeRepoName" }
+    Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$psesRepoName" }
 }
 Copy-GitRepository @cloneParams -Verbose:$VerbosePreference
 
diff --git a/tools/postReleaseScripts/updateAzureDataStudio.ps1 b/tools/postReleaseScripts/updateAzureDataStudio.ps1
index b82fee6eed..3db678f1c8 100644
--- a/tools/postReleaseScripts/updateAzureDataStudio.ps1
+++ b/tools/postReleaseScripts/updateAzureDataStudio.ps1
@@ -16,6 +16,10 @@ param(
     [string[]]
     $GalleryFileName = ('extensionsGallery.json','extensionsGallery-insider.json'),
 
+    [Parameter()]
+    [string]
+    $SourceFork = 'rjmholt',
+
     [Parameter()]
     [string]
     $TargetFork = 'Microsoft',
@@ -52,7 +56,7 @@ function NewReleaseVersionEntry
         files = @(
             [ordered]@{
                 assetType = 'Microsoft.VisualStudio.Services.VSIXPackage'
-                source = "https://sqlopsextensions.blob.core.windows.net/extensions/powershell/PowerShell-$Version.vsix"
+                source = "https://sqlopsextensions.blob.core.windows.net/extensions/powershell/ms-vscode.PowerShell-$Version.vsix"
             }
             [ordered]@{
                 assetType = 'Microsoft.VisualStudio.Services.Icons.Default'
@@ -244,7 +248,7 @@ function UpdateGalleryFile
 $repoLocation = Join-Path ([System.IO.Path]::GetTempPath()) 'ads-temp-checkout'
 
 $cloneParams = @{
-    OriginRemote = 'https://github.com/rjmholt/AzureDataStudio'
+    OriginRemote = "https://github.com/$SourceFork/AzureDataStudio"
     Destination = $repoLocation
     CloneBranch = 'release/extensions'
     CheckoutBranch = $branchName
@@ -271,6 +275,6 @@ $prParams = @{
     Title = "Update PowerShell extension to v$ExtensionVersion"
     Description = $PRDescription
     GitHubToken = $GitHubToken
-    FromOrg = 'rjmholt'
+    FromOrg = $SourceFork
 }
 New-GitHubPR @prParams