diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml
index 8facf4399..27a23d3ec 100644
--- a/build/azure-devops/buildimages.yaml
+++ b/build/azure-devops/buildimages.yaml
@@ -27,8 +27,7 @@ jobs:
       PLATFORM: win
       NODE_IMAGE: stefanscherer/node-windows:10
 - job: BuildLinux
-  condition: true
-  # condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
+  condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml
index 5359e2329..162128d0a 100644
--- a/build/azure-devops/multiarch.yaml
+++ b/build/azure-devops/multiarch.yaml
@@ -6,8 +6,7 @@ parameters:
 
 jobs:
 - job: manifest
-  condition: true
-  # condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
+  condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
   dependsOn:
     # - BuildWindows
     - BuildLinux  
@@ -27,8 +26,8 @@ jobs:
       mkdir -p ~/.docker
       sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
       echo ',"experimental": "enabled" }' >> ~/.docker/config.json
-      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:pr-test-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:pr-test-linux-${{ parameters.branch }}
-      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:pr-test-latest ${{ parameters.registry }}/${{ parameters.image }}:pr-test-linux-latest
-      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:pr-test-${{ parameters.branch }}
-      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:pr-test-latest
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:{{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }}
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest
+      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}
+      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:latest
     displayName: Create multiarch manifest