diff --git a/.pipelines/onebranch/pipeline.buildrp.official.yml b/.pipelines/onebranch/pipeline.buildrp.official.yml
index 7245dee49bf..922dfa4c664 100644
--- a/.pipelines/onebranch/pipeline.buildrp.official.yml
+++ b/.pipelines/onebranch/pipeline.buildrp.official.yml
@@ -47,7 +47,20 @@ extends:
         suppressionSet: default
 
     stages:
+    - stage: Build_ARO
+      jobs:
+      - job: Build_ARO
+        pool:
+          type: linux
+
+        variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
+          ob_outputDirectory: $(Build.SourcesDirectory)/out   # this directory is uploaded to pipeline artifacts, reddog and cloudvault. More info at https://aka.ms/obpipelines/artifacts
+
+        steps:
+        - template: .pipelines/onebranch/templates/template-buildrp-buildaro.yml@self
+
     - stage: Build_Docker_Image
+      dependsOn: Build_ARO
       jobs:
       - job: Build_Docker_Image
         pool:
@@ -56,19 +69,7 @@ extends:
 
         variables:
           ob_git_checkout: true
+          release_tag: $[stageDependencies.Build_ARO.Build_ARO.outputs['buildaro.releasetag']]
 
         steps:
         - template: .pipelines/onebranch/templates/template-buildrp-builddocker.yml@self
-
-
-    - stage: Build_ARO
-      jobs:
-      - job: Build_ARO
-        pool:
-          type: linux
-
-        variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
-          ob_outputDirectory: $(Build.SourcesDirectory)/out   # this directory is uploaded to pipeline artifacts, reddog and cloudvault. More info at https://aka.ms/obpipelines/artifacts
-
-        steps:
-        - template: .pipelines/onebranch/templates/template-buildrp-buildaro.yml@self
diff --git a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml
index 8ddd206866a..19e13ad96f4 100644
--- a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml
+++ b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml
@@ -47,7 +47,20 @@ extends:
         suppressionSet: default
 
     stages:
+    - stage: Build_ARO
+      jobs:
+      - job: Build_ARO
+        pool:
+          type: linux
+
+        variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
+          ob_outputDirectory: $(Build.SourcesDirectory)/out   # this directory is uploaded to pipeline artifacts, reddog and cloudvault. More info at https://aka.ms/obpipelines/artifacts
+
+        steps:
+        - template: .pipelines/onebranch/templates/template-buildrp-buildaro.yml@self
+
     - stage: Build_Docker_Image
+      dependsOn: Build_ARO
       jobs:
       - job: Build_Docker_Image
         pool:
@@ -56,19 +69,7 @@ extends:
 
         variables:
           ob_git_checkout: true
+          release_tag: $[stageDependencies.Build_ARO.Build_ARO.outputs['buildaro.releasetag']]
 
         steps:
         - template: .pipelines/onebranch/templates/template-buildrp-builddocker.yml@self
-
-
-    - stage: Build_ARO
-      jobs:
-      - job: Build_ARO
-        pool:
-          type: linux
-
-        variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
-          ob_outputDirectory: $(Build.SourcesDirectory)/out   # this directory is uploaded to pipeline artifacts, reddog and cloudvault. More info at https://aka.ms/obpipelines/artifacts
-
-        steps:
-        - template: .pipelines/onebranch/templates/template-buildrp-buildaro.yml@self
diff --git a/.pipelines/onebranch/templates/template-buildrp-buildaro.yml b/.pipelines/onebranch/templates/template-buildrp-buildaro.yml
index 5cd18914659..941d020f622 100644
--- a/.pipelines/onebranch/templates/template-buildrp-buildaro.yml
+++ b/.pipelines/onebranch/templates/template-buildrp-buildaro.yml
@@ -5,6 +5,16 @@ steps:
     targetType: inline
     script: |
       export GOPATH=$(Agent.TempDirectory)
+      export TAG=$(git describe --exact-match 2>/dev/null)
+      export COMMIT=$(git rev-parse --short=7 HEAD)$([[ $(git status --porcelain) = "" ]] || echo -dirty)
+      if [ -z "$TAG" ];
+      then
+        export VERSION=${COMMIT}
+      else
+        export VERSION=${TAG}
+      fi
+      echo "Version: ${VERSION}"
+      echo "##vso[task.setvariable variable=releasetag;isOutput=true]${VERSION}"
       mkdir -p $(Agent.TempDirectory)/src/github.com/Azure/
       cp -rd $(Build.SourcesDirectory) $(Agent.TempDirectory)/src/github.com/Azure/ARO-RP
       cd $(Agent.TempDirectory)/src/github.com/Azure/ARO-RP
@@ -12,6 +22,7 @@ steps:
       mkdir -p $(ob_outputDirectory) 
       cp aro $(ob_outputDirectory)/aro
     workingDirectory: $(Build.SourcesDirectory)
+  name: buildaro
 - task: Bash@3
   displayName: 🕵️ Validate FIPS
   inputs:
diff --git a/.pipelines/onebranch/templates/template-buildrp-builddocker.yml b/.pipelines/onebranch/templates/template-buildrp-builddocker.yml
index 5ec9414e52c..867edc356f4 100644
--- a/.pipelines/onebranch/templates/template-buildrp-builddocker.yml
+++ b/.pipelines/onebranch/templates/template-buildrp-builddocker.yml
@@ -9,4 +9,4 @@ steps:
     saveImageToPath: aro-rp.tar
     buildkit: 1
     enable_network: true
-    build_tag: $(Build.SourceBranchName)
+    build_tag: $(release_tag)