diff --git a/scripts/GenerateTags.ps1 b/scripts/GenerateTags.ps1
index e115093c91..5fc2ed9ee7 100755
--- a/scripts/GenerateTags.ps1
+++ b/scripts/GenerateTags.ps1
@@ -84,15 +84,16 @@ if (-not $PSCmdlet.ShouldContinue("Continue?", "This will apply tags to all subm
     exit 1
 }
 
+
+$universeTag = Get-PackageVersion $repoRoot
+New-GitTag $repoRoot $universeTag -WhatIf:$WhatIfPreference
+
 $tags = @([pscustomobject] @{
         repo   = $(git config remote.origin.url)
         tag    = $universeTag
         commit = $(git rev-parse HEAD)
     })
 
-$universeTag = Get-PackageVersion $repoRoot
-New-GitTag $repoRoot $universeTag -WhatIf:$WhatIfPreference
-
 Get-Submodules $repoRoot | ForEach-Object {
     $modPath = $_.path
     $module = $_.module
diff --git a/scripts/UpdateBuildTools.ps1 b/scripts/UpdateBuildTools.ps1
index 63d05cc4c2..9e2ac5541d 100755
--- a/scripts/UpdateBuildTools.ps1
+++ b/scripts/UpdateBuildTools.ps1
@@ -13,6 +13,8 @@
     Additional arguments to pass into git-commit
 .PARAMETER NoCommit
     Make changes without executing git-commit
+.PARAMETER ToolsSource
+    The location of the build tools
 .PARAMETER Force
     Specified this to make a commit with any changes
 #>
@@ -22,6 +24,7 @@ param(
     [string]$GitAuthorName = $null,
     [string]$GitAuthorEmail = $null,
     [string[]]$GitCommitArgs = @(),
+    [string]$ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools',
     [switch]$NoCommit,
     [switch]$Force
 )
@@ -54,7 +57,7 @@ try {
 
     $oldVersion = Get-KoreBuildVersion
 
-    & "$RepoRoot/run.ps1" -Update -Command noop | Out-Null
+    & "$RepoRoot/run.ps1" -Update -ToolsSource $ToolsSource -Command noop | Out-Null
 
     $newVersion = Get-KoreBuildVersion