diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml
index 81d688961..36701ebaa 100644
--- a/build/azure-devops/buildimages.yaml
+++ b/build/azure-devops/buildimages.yaml
@@ -8,24 +8,20 @@ jobs:
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
-  - task: Bash@3
+  - bash: docker-compose build ${{ parameters.images }}
     displayName: Create multiarch manifest
-    inputs:
-      script: docker-compose build ${{ parameters.images }}
-      env:
-        TAG: ${{ variables['Build.SourceBranchName'] }}
+    env:
+      TAG: ${{ variables['Build.SourceBranchName'] }}    
 - job: BuildContainersForPR_Windows
   condition: eq(${{ variables['Build.Reason'] }}, 'PullRequest'))
   pool:
     vmImage: 'windows-2019'
   steps:
-  - task: Bash@3
+  - bash: docker-compose build ${{ parameters.images }}
     displayName: Create multiarch manifest
-    inputs:
-      env:
-        TAG: ${{ variables['Build.SourceBranchName'] }}
-        PLATFORM: win
-      script: docker-compose build ${{ parameters.images }}
+    env:
+      TAG: ${{ variables['Build.SourceBranchName'] }} 
+      PLATFORM: win
 - job: BuildLinux
   condition: ne(${{ variables['Build.Reason'] }}, 'PullRequest'))
   pool: