diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index fab10bfeee6..896aaa710c1 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -97,14 +97,15 @@ stages:
           buildMachine: 'qemuarm-64,raspberrypi3-64,raspberrypi4-64,odroid-c2,orangepi-prime'
     steps:
     - template: templates/azp-step-ha-version.yaml@azure
-    - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
+    - script: |
+        docker login -u $(dockerUser) -p $(dockerPassword)
       displayName: 'Docker hub login'
-    - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
+    - script: docker pull homeassistant/amd64-builder:$(versionBuilder)
       displayName: 'Install Builder'
     - script: |
         set -e
 
-        sudo docker run --rm --privileged \
+        docker run --rm --privileged \
           -v ~/.docker:/root/.docker:rw \
           -v /run/docker.sock:/run/docker.sock:rw \
           -v $(pwd):/homeassistant:ro \
@@ -113,7 +114,7 @@ stages:
           -r https://github.com/home-assistant/hassio-homeassistant \
           -t generic --docker-hub homeassistant
 
-        sudo docker run --rm --privileged \
+        docker run --rm --privileged \
           -v ~/.docker:/root/.docker \
           -v /run/docker.sock:/run/docker.sock:rw \
           homeassistant/amd64-builder:$(versionBuilder) \
@@ -169,53 +170,51 @@ stages:
     steps:
     - template: templates/azp-step-ha-version.yaml@azure
     - script: |
-        mkdir -p ~/.docker
-        echo '{ "experimental": "enabled" }' > .docker/config.json
-
-        sudo docker login -u $(dockerUser) -p $(dockerPassword)
-      displayName: 'Enable manifest / Docker login'
+        docker login -u $(dockerUser) -p $(dockerPassword)
+      displayName: 'Docker login'
     - script: |
         set -e
+        export DOCKER_CLI_EXPERIMENTAL=enabled
 
         function create_manifest() {
           local tag_l=$1
           local tag_r=$2
 
-          sudo docker --config .docker manifest create homeassistant/home-assistant:${tag_l} \
+          docker manifest create homeassistant/home-assistant:${tag_l} \
             homeassistant/amd64-homeassistant:${tag_r} \
             homeassistant/i386-homeassistant:${tag_r} \
             homeassistant/armhf-homeassistant:${tag_r} \
             homeassistant/armv7-homeassistant:${tag_r} \
             homeassistant/aarch64-homeassistant:${tag_r}
 
-          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/amd64-homeassistant:${tag_r} \
             --os linux --arch amd64
 
-          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/i386-homeassistant:${tag_r} \
             --os linux --arch 386
 
-          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/armhf-homeassistant:${tag_r} \
             --os linux --arch arm --variant=v6
 
-          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/armv7-homeassistant:${tag_r} \
             --os linux --arch arm --variant=v7
 
-          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/aarch64-homeassistant:${tag_r} \
             --os linux --arch arm64 --variant=v8
 
-          sudo docker --config .docker manifest push --purge homeassistant/home-assistant:${tag_l}
+          docker manifest push --purge homeassistant/home-assistant:${tag_l}
         }
 
-        sudo docker pull homeassistant/amd64-homeassistant:$(homeassistantRelease)
-        sudo docker pull homeassistant/i386-homeassistant:$(homeassistantRelease)
-        sudo docker pull homeassistant/armhf-homeassistant:$(homeassistantRelease)
-        sudo docker pull homeassistant/armv7-homeassistant:$(homeassistantRelease)
-        sudo docker pull homeassistant/aarch64-homeassistant:$(homeassistantRelease)
+        docker pull homeassistant/amd64-homeassistant:$(homeassistantRelease)
+        docker pull homeassistant/i386-homeassistant:$(homeassistantRelease)
+        docker pull homeassistant/armhf-homeassistant:$(homeassistantRelease)
+        docker pull homeassistant/armv7-homeassistant:$(homeassistantRelease)
+        docker pull homeassistant/aarch64-homeassistant:$(homeassistantRelease)
 
         # Create version tag
         create_manifest "$(homeassistantRelease)" "$(homeassistantRelease)"