diff --git a/build/azure-devops/basket-api/azure-pipelines.yml b/build/azure-devops/basket-api/azure-pipelines.yml
index d4643d72e..6bd7e52da 100644
--- a/build/azure-devops/basket-api/azure-pipelines.yml
+++ b/build/azure-devops/basket-api/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: basket.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml
index e5853e1ba..03c588e8f 100644
--- a/build/azure-devops/catalog-api/azure-pipelines.yml
+++ b/build/azure-devops/catalog-api/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: catalog.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
diff --git a/build/azure-devops/identity-api/azure-pipelines.yml b/build/azure-devops/identity-api/azure-pipelines.yml
index ecd80e56a..5e48bbccc 100644
--- a/build/azure-devops/identity-api/azure-pipelines.yml
+++ b/build/azure-devops/identity-api/azure-pipelines.yml
@@ -73,3 +73,8 @@ jobs:
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
         PLATFORM=win   
+- template: ../multiarch.yaml
+  parameters:
+    image: identity.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
diff --git a/build/azure-devops/location-api/azure-pipelines.yml b/build/azure-devops/location-api/azure-pipelines.yml
index f33dbacdc..adc814863 100644
--- a/build/azure-devops/location-api/azure-pipelines.yml
+++ b/build/azure-devops/location-api/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: locations.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
diff --git a/build/azure-devops/marketing-api/azure-pipelines.yml b/build/azure-devops/marketing-api/azure-pipelines.yml
index ee1c585a6..59fe1d843 100644
--- a/build/azure-devops/marketing-api/azure-pipelines.yml
+++ b/build/azure-devops/marketing-api/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: marketing.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
diff --git a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
index 355a3d757..029386084 100644
--- a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
+++ b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
         PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: mobileshoppingagg
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
 
diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml
index 93f2451bc..697aba305 100644
--- a/build/azure-devops/multiarch.yaml
+++ b/build/azure-devops/multiarch.yaml
@@ -17,7 +17,6 @@ jobs:
   - bash: |
      mkdir -p ~/.docker
      echo '{ "experimental": "enabled" }' > ~/.docker/config.json
-     docker login -u $(DOCKER_USER) -p $(DOCKER_PASSWORD)
      docker --config ~/.docker manifest create eshop/${{ parameters.image }}:${{ parameters.branch }} eshop/${{ parameters.image }}:linux-${{ parameters.branch }} eshop/${{ parameters.image }}:win-${{ parameters.branch }}
      docker --config ~/.docker manifest create eshop/${{ parameters.image }}:latest eshop/${{ parameters.image }}:linux-latest eshop/${{ parameters.image }}:win-latest
     displayName: 'Create Manifest' 
diff --git a/build/azure-devops/ordering-api/azure-pipelines.yml b/build/azure-devops/ordering-api/azure-pipelines.yml
index 120ca7544..47cc0370e 100644
--- a/build/azure-devops/ordering-api/azure-pipelines.yml
+++ b/build/azure-devops/ordering-api/azure-pipelines.yml
@@ -74,4 +74,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: ordering.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/payment-api/azure-pipelines.yml b/build/azure-devops/payment-api/azure-pipelines.yml
index df82cf054..f472470cb 100644
--- a/build/azure-devops/payment-api/azure-pipelines.yml
+++ b/build/azure-devops/payment-api/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win 
\ No newline at end of file
+        PLATFORM=win 
+- template: ../multiarch.yaml
+  parameters:
+    image: payment.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/web-shopping-agg/azure-pipelines.yml b/build/azure-devops/web-shopping-agg/azure-pipelines.yml
index 5ddbdad93..7ba05c4f5 100644
--- a/build/azure-devops/web-shopping-agg/azure-pipelines.yml
+++ b/build/azure-devops/web-shopping-agg/azure-pipelines.yml
@@ -71,4 +71,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: webshoppingagg
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/webhooks-api/azure-pipelines.yml b/build/azure-devops/webhooks-api/azure-pipelines.yml
index e47263064..d30ce074a 100644
--- a/build/azure-devops/webhooks-api/azure-pipelines.yml
+++ b/build/azure-devops/webhooks-api/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: webhooks.api
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/webhooks-client/azure-pipelines.yml b/build/azure-devops/webhooks-client/azure-pipelines.yml
index c50aa073b..30ad411e3 100644
--- a/build/azure-devops/webhooks-client/azure-pipelines.yml
+++ b/build/azure-devops/webhooks-client/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)v
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: webhooks.client
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/webmvc/azure-pipelines.yml b/build/azure-devops/webmvc/azure-pipelines.yml
index 79634f260..69fea5360 100644
--- a/build/azure-devops/webmvc/azure-pipelines.yml
+++ b/build/azure-devops/webmvc/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: webmvc
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml
index 3b8747610..ea3e8a232 100644
--- a/build/azure-devops/webspa/azure-pipelines.yml
+++ b/build/azure-devops/webspa/azure-pipelines.yml
@@ -74,4 +74,9 @@ jobs:
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
         PLATFORM=win
-        NODE_IMAGE=stefanscherer/node-windows:8.11
\ No newline at end of file
+        NODE_IMAGE=stefanscherer/node-windows:8.11
+- template: ../multiarch.yaml
+  parameters:
+    image: webspa
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file
diff --git a/build/azure-devops/webstatus/azure-pipelines.yml b/build/azure-devops/webstatus/azure-pipelines.yml
index 45d86607f..34f79694a 100644
--- a/build/azure-devops/webstatus/azure-pipelines.yml
+++ b/build/azure-devops/webstatus/azure-pipelines.yml
@@ -72,4 +72,9 @@ jobs:
       projectName: ""
       dockerComposeFileArgs: |
         TAG=$(Build.SourceBranchName)
-        PLATFORM=win
\ No newline at end of file
+        PLATFORM=win
+- template: ../multiarch.yaml
+  parameters:
+    image: webstatus
+    branch: $(Build.SourceBranchName)
+    registryEndpoint: $(registryEndpoint)
\ No newline at end of file