diff --git a/build-publish.yml b/build-publish.yml
index 2428d35..97e7f20 100644
--- a/build-publish.yml
+++ b/build-publish.yml
@@ -75,7 +75,7 @@ jobs:
       - template: pipeline-templates/linux-build-steps.yml
       - task: AzureKeyVault@2
         inputs:
-          azureSubscription: 'OneIdentity.RD.SBox.Safeguard-ServiceConnection'
+          azureSubscription: 'SafeguardOpenSource'
           KeyVaultName: 'SafeguardBuildSecrets'
           SecretsFilter: 'DockerHubAccessToken,DockerHubPassword'
         displayName: 'Get Docker Hub Access Token from Sandbox Azure Key Vault'
@@ -87,9 +87,6 @@ jobs:
           script: |
             docker login -u danpetersonoi --password-stdin <<<$(DockerHubAccessToken) 2>/dev/null
 
-            docker tag oneidentity/safeguard-devops:$(VersionString)-alpine3.12 oneidentity/safeguard-devops:$(VersionString)-alpine
-            docker tag oneidentity/safeguard-devops:$(VersionString)-alpine3.12 oneidentity/safeguard-devops:latest
-            docker push oneidentity/safeguard-devops:$(VersionString)-alpine3.12
             docker push oneidentity/safeguard-devops:$(VersionString)-alpine
             docker push oneidentity/safeguard-devops:latest
 
@@ -109,7 +106,7 @@ jobs:
       - template: pipeline-templates/linux-build-steps.yml
       - task: AzureKeyVault@2
         inputs:
-          azureSubscription: 'OneIdentity.RD.SBox.Safeguard-ServiceConnection'
+          azureSubscription: 'SafeguardOpenSource'
           KeyVaultName: 'SafeguardBuildSecrets'
           SecretsFilter: 'DockerHubAccessToken,DockerHubPassword'
         displayName: 'Get Docker Hub Access Token from Sandbox Azure Key Vault'
@@ -121,8 +118,6 @@ jobs:
           script: |
             docker login -u danpetersonoi --password-stdin <<<$(DockerHubAccessToken) 2>/dev/null
 
-            docker tag oneidentity/safeguard-devops:$(VersionString)-ubuntu20.04 oneidentity/safeguard-devops:$(VersionString)-ubuntu
-            docker push oneidentity/safeguard-devops:$(VersionString)-ubuntu20.04
             docker push oneidentity/safeguard-devops:$(VersionString)-ubuntu
 
             docker logout
diff --git a/pipeline-templates/global-variables.yml b/pipeline-templates/global-variables.yml
index 301be94..3e0bbcf 100644
--- a/pipeline-templates/global-variables.yml
+++ b/pipeline-templates/global-variables.yml
@@ -12,7 +12,7 @@
 # azure pipeline Reached heap limit Allocation failed - JavaScript heap out of memory The command "npm install" exited with code 134    
 variables:
   - name: semanticVersion
-    value: "8.0.0"
+    value: "8.2.0"
   - name: isPrerelease
     value: ${{ true }}
   - name: isReleaseBranch
diff --git a/pipeline-templates/linux-build-steps.yml b/pipeline-templates/linux-build-steps.yml
index 7ff6a94..3d8ac13 100644
--- a/pipeline-templates/linux-build-steps.yml
+++ b/pipeline-templates/linux-build-steps.yml
@@ -14,8 +14,9 @@ steps:
 
   - task: Bash@3
     inputs:
-      targetType: 'filePath'
-      filePath: '$(System.DefaultWorkingDirectory)/build-docker.sh'
-      arguments: $(imageType) $(VersionString)
+      targetType: 'inline'
+      script: |
+        $(System.DefaultWorkingDirectory)/build-docker.sh $(imageType) $(VersionString)
+        docker tag oneidentity/safeguard-devops:$(VersionString)-$(imageType) oneidentity/safeguard-devops:latest
       failOnStderr: true
     displayName: 'Building docker image'