diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
index 290143f2a..1fec883b9 100644
--- a/.pipelines/PowerShell-Docker-Image-Build-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -42,6 +42,9 @@ extends:
   parameters:
     featureFlags:
       runHostSDL: true
+      # Work around regression in OneBranch docker builds
+      LinuxHostVersion:
+        Distribution: Ubuntu
     customTags: 'ES365AIMigrationTooling-BulkMigrated'
     stages:
     - stage: StageResolveVersionandYaml
diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
index 75a1b3722..41000caed 100644
--- a/.vsts-ci/releaseJob.yml
+++ b/.vsts-ci/releaseJob.yml
@@ -73,9 +73,7 @@ jobs:
     name: setImageNameStep
   - pwsh: |
       $afdUri = "https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/install/?fakesas=yes"
-      $uriObj = [System.Uri]::new($afdUri)
-      $url =  $uriObj.ToString()
-      Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
+      Write-Host "##vso[task.setvariable variable=SasUrl;]$afdUri"
     displayName: 'Set SasUrl variable'
   - pwsh: |
       Get-ChildItem env: | Out-String -Width 1000
@@ -128,12 +126,6 @@ jobs:
       targetPath: $(Build.SourcesDirectory)/dst/$(dockerBuildImageName)
       artifact: drop_StageGenerateBuild_${{ parameters.channel }}_Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
     displayName: 'Download artifact to which Dockerfile was uploaded'
-  - task: onebranch.pipeline.containercontrol@1
-    displayName: "Login to source ACR"
-    inputs:
-      command: login
-      acr_name: $(ACRName)
-      tenant: MSFT
   - task: onebranch.pipeline.imagebuildinfo@1
     displayName: image build
     inputs:
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 69c6f7038..01aa55f94 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -906,18 +906,18 @@ function Get-SASBuildArgs
 
             $packageName = $allMeta.meta.PackageFormat -replace '\${PS_VERSION}', $packageVersion
             $packageName = $packageName -replace '\${channelTag}', $channelTag
-            $containerName = 'v' + ($psversion -replace '\.', '-') -replace '~', '-'
+            $containerName = 'v' + ($psversion) -replace '~', '-'
             $packageUrl.Path = $packageUrl.Path + $containerName + '/' + $packageName
             $packageUrl.Query = $sasData.sasQuery
             if($allMeta.meta.Base64EncodePackageUrl)
             {
-                $urlBytes = [System.Text.Encoding]::Unicode.GetBytes($packageUrl.ToString())
+                $urlBytes = [System.Text.Encoding]::Unicode.GetBytes($packageUrl.Uri.ToString())
                 $encodedUrl =[Convert]::ToBase64String($urlBytes)
                 $buildArgs.Add('PS_PACKAGE_URL_BASE64', $encodedUrl)
             }
             else
             {
-                $buildArgs.Add('PS_PACKAGE_URL', $packageUrl.ToString())
+                $buildArgs.Add('PS_PACKAGE_URL', $packageUrl.Uri.ToString())
             }
         }
     }