diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e35ad28..7b4baa6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -80,6 +80,8 @@ jobs:
       aarch64:
         buildArch: 'aarch64'
   steps:
+  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
+    displayName: 'Docker hub login'
   - template: template-addon.yml
     parameters:
       addonFolder: 'cec_scan'
diff --git a/template-addon.yml b/template-addon.yml
index 463bcf5..bd109a5 100644
--- a/template-addon.yml
+++ b/template-addon.yml
@@ -7,8 +7,6 @@ parameters:
 steps:
   - script: sudo apt-get install -y jq curl
     displayName: 'Install JQ/curl'
-  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
-    displayName: 'Docker hub login'
   - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
     displayName: 'Install Builder'
   - script: |
@@ -27,4 +25,4 @@ steps:
         homeassistant/amd64-builder:$(versionBuilder) \
         --addon "--${{ parameters.buildArch }}" -t /data/${{ parameters.addonFolder }} \
         --docker-hub homeassistant
-    displayName: 'Build Python base-images'
+    displayName: 'Build ${{ addonFolder }}'