diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index d95a22e111b..6da0b128e47 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -82,19 +82,14 @@ stages:
       matrix:
         amd64:
           buildArch: 'amd64'
-          buildMachine: 'qemux86-64,intel-nuc'
         i386:
           buildArch: 'i386'
-          buildMachine: 'qemux86'
         armhf:
           buildArch: 'armhf'
-          buildMachine: 'qemuarm,raspberrypi'
         armv7:
           buildArch: 'armv7'
-          buildMachine: 'raspberrypi2,raspberrypi3,raspberrypi4,odroid-xu,tinker'
         aarch64:
           buildArch: 'aarch64'
-          buildMachine: 'qemuarm-64,raspberrypi3-64,raspberrypi4-64,odroid-c2,odroid-n2'
     steps:
     - template: templates/azp-step-ha-version.yaml@azure
     - script: |
@@ -111,6 +106,57 @@ stages:
           -v $(pwd):/data:ro \
           homeassistant/amd64-builder:$(versionBuilder) \
           --generic $(homeassistantRelease) "--$(buildArch)" -t /data \
+      displayName: 'Build Release'
+  - job: 'ReleaseMachine'
+    dependsOn:
+    - ReleaseDocker
+    timeoutInMinutes: 240
+    pool:
+      vmImage: 'ubuntu-latest'
+    strategy:
+      maxParallel: 15
+      matrix:
+        qemux86-64:
+          buildMachine: 'qemux86-64'
+        intel-nuc:
+          buildMachine: 'intel-nuc'
+        qemux86:
+          buildMachine: 'qemux86'
+        qemuarm:
+          buildMachine: 'qemuarm'
+        raspberrypi:
+          buildMachine: 'raspberrypi'
+        raspberrypi2:
+          buildMachine: 'raspberrypi2'
+        raspberrypi3:
+          buildMachine: 'raspberrypi3'
+        raspberrypi4:
+          buildMachine: 'raspberrypi4'
+        odroid-xu:
+          buildMachine: 'odroid-xu'
+        tinker:
+          buildMachine: 'tinker'
+        qemuarm-64:
+          buildMachine: 'qemuarm-64'
+        raspberrypi3-64:
+          buildMachine: 'raspberrypi3-64'
+        raspberrypi4-64:
+          buildMachine: 'raspberrypi4-64'
+        odroid-c2:
+          buildMachine: 'odroid-c2'
+        odroid-c4:
+          buildMachine: 'odroid-c4'
+        odroid-n2:
+          buildMachine: 'odroid-n2'
+    steps:
+    - template: templates/azp-step-ha-version.yaml@azure
+    - script: |
+        docker login -u $(dockerUser) -p $(dockerPassword)
+      displayName: 'Docker hub login'
+    - script: docker pull homeassistant/amd64-builder:$(versionBuilder)
+      displayName: 'Install Builder'
+    - script: |
+        set -e
 
         docker run --rm --privileged \
           -v ~/.docker:/root/.docker \
@@ -119,7 +165,7 @@ stages:
           homeassistant/amd64-builder:$(versionBuilder) \
           --homeassistant-machine "$(homeassistantRelease)=$(buildMachine)" \
           -t /data/machine --docker-hub homeassistant
-      displayName: 'Build Release'
+      displayName: 'Build Machine'
 
 - stage: 'Publish'
   jobs: