diff --git a/build/azure-devops/basket-api/azure-pipelines.yml b/build/azure-devops/basket-api/azure-pipelines.yml
index 6d94c5918..d4643d72e 100644
--- a/build/azure-devops/basket-api/azure-pipelines.yml
+++ b/build/azure-devops/basket-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -12,34 +10,66 @@ trigger:
     - src/BuildingBlocks/*
     - src/Services/Basket/*
     - k8s/helm/basket-api/*
-steps:
-- task: DockerCompose@0
-  displayName: Compose build basket
-  inputs:
-    dockerComposeCommand: 'build basket.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push basket
-  inputs:
-    dockerComposeCommand: 'push basket.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build basket
+    inputs:
+      dockerComposeCommand: 'build basket.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push basket
+    inputs:
+      dockerComposeCommand: 'push basket.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build basket
+    inputs:
+      dockerComposeCommand: 'build basket.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push basket
+    inputs:
+      dockerComposeCommand: 'push basket.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ No newline at end of file
diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml
index d277d4777..e5853e1ba 100644
--- a/build/azure-devops/catalog-api/azure-pipelines.yml
+++ b/build/azure-devops/catalog-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -12,34 +10,66 @@ trigger:
     - src/BuildingBlocks/*
     - src/Services/Catalog/*
     - k8s/helm/catalog-api/*    
-steps:
-- task: DockerCompose@0
-  displayName: Compose build catalog
-  inputs:
-    dockerComposeCommand: 'build catalog.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push catalog
-  inputs:
-    dockerComposeCommand: 'push catalog.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build catalog
+    inputs:
+      dockerComposeCommand: 'build catalog.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push catalog
+    inputs:
+      dockerComposeCommand: 'push catalog.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindow
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build catalog
+    inputs:
+      dockerComposeCommand: 'build catalog.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push catalog
+    inputs:
+      dockerComposeCommand: 'push catalog.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ No newline at end of file
diff --git a/build/azure-devops/identity-api/azure-pipelines.yml b/build/azure-devops/identity-api/azure-pipelines.yml
index 454c03d16..ecd80e56a 100644
--- a/build/azure-devops/identity-api/azure-pipelines.yml
+++ b/build/azure-devops/identity-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -12,34 +10,66 @@ trigger:
     - src/BuildingBlocks/*
     - src/Services/Identity/*
     - k8s/helm/identity-api/*      
-steps:
-- task: DockerCompose@0
-  displayName: Compose build identity
-  inputs:
-    dockerComposeCommand: 'build identity.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push identity
-  inputs:
-    dockerComposeCommand: 'push identity.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build identity
+    inputs:
+      dockerComposeCommand: 'build identity.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push identity
+    inputs:
+      dockerComposeCommand: 'push identity.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build identity
+    inputs:
+      dockerComposeCommand: 'build identity.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win   
+  - task: DockerCompose@0
+    displayName: Compose push identity
+    inputs:
+      dockerComposeCommand: 'push identity.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win   
diff --git a/build/azure-devops/location-api/azure-pipelines.yml b/build/azure-devops/location-api/azure-pipelines.yml
index ab3d31b3f..f33dbacdc 100644
--- a/build/azure-devops/location-api/azure-pipelines.yml
+++ b/build/azure-devops/location-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -11,35 +9,67 @@ trigger:
     include:
     - src/BuildingBlocks/*
     - src/Services/Location/*
-    - k8s/helm/locations-api/*          
-steps:
-- task: DockerCompose@0
-  displayName: Compose build locations
-  inputs:
-    dockerComposeCommand: 'build locations.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push locations
-  inputs:
-    dockerComposeCommand: 'push locations.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/locations-api/*   
+jobs:
+- job: BuildLinux   
+  pool:
+    vmImage: 'ubuntu-16.04'       
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build locations
+    inputs:
+      dockerComposeCommand: 'build locations.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push locations
+    inputs:
+      dockerComposeCommand: 'push locations.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows 
+  pool:
+    vmImage: 'windows-2019'       
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build locations
+    inputs:
+      dockerComposeCommand: 'build locations.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push locations
+    inputs:
+      dockerComposeCommand: 'push locations.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ No newline at end of file
diff --git a/build/azure-devops/marketing-api/azure-pipelines.yml b/build/azure-devops/marketing-api/azure-pipelines.yml
index 193a0cccf..ee1c585a6 100644
--- a/build/azure-devops/marketing-api/azure-pipelines.yml
+++ b/build/azure-devops/marketing-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -11,35 +9,67 @@ trigger:
     include:
     - src/BuildingBlocks/*
     - src/Services/Marketing/*
-    - k8s/helm/marketing-api/*            
-steps:
-- task: DockerCompose@0
-  displayName: Compose build marketing
-  inputs:
-    dockerComposeCommand: 'build marketing.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push marketing
-  inputs:
-    dockerComposeCommand: 'push marketing.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/marketing-api/*  
+jobs:
+- job: BuildLinux     
+  pool:
+    vmImage: 'ubuntu-16.04'     
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build marketing
+    inputs:
+      dockerComposeCommand: 'build marketing.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push marketing
+    inputs:
+      dockerComposeCommand: 'push marketing.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build marketing
+    inputs:
+      dockerComposeCommand: 'build marketing.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push marketing
+    inputs:
+      dockerComposeCommand: 'push marketing.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ No newline at end of file
diff --git a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
index 6fb0018a1..355a3d757 100644
--- a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
+++ b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -10,35 +8,68 @@ trigger:
   paths:
     include:
     - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
-    - k8s/helm/mobileshoppingagg/*          
-steps:
-- task: DockerCompose@0
-  displayName: Compose build mobileshoppingagg
-  inputs:
-    dockerComposeCommand: 'build mobileshoppingagg'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push mobileshoppingagg
-  inputs:
-    dockerComposeCommand: 'push mobileshoppingagg'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/mobileshoppingagg/*   
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'       
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build mobileshoppingagg
+    inputs:
+      dockerComposeCommand: 'build mobileshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push mobileshoppingagg
+    inputs:
+      dockerComposeCommand: 'push mobileshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'    
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build mobileshoppingagg
+    inputs:
+      dockerComposeCommand: 'build mobileshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push mobileshoppingagg
+    inputs:
+      dockerComposeCommand: 'push mobileshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+
diff --git a/build/azure-devops/ordering-api/azure-pipelines.yml b/build/azure-devops/ordering-api/azure-pipelines.yml
index ef0b17a32..120ca7544 100644
--- a/build/azure-devops/ordering-api/azure-pipelines.yml
+++ b/build/azure-devops/ordering-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -14,34 +12,66 @@ trigger:
     - k8s/helm/ordering-api/*  
     - k8s/helm/ordering-backgroundtasks/*
     - k8s/helm/ordering-signalrhub/*
-steps:
-- task: DockerCompose@0
-  displayName: Compose build ordering 
-  inputs:
-    dockerComposeCommand: 'build ordering.api ordering.backgroundtasks ordering.signalrhub'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push ordering
-  inputs:
-    dockerComposeCommand: 'push ordering.api ordering.backgroundtasks ordering.signalrhub'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'    
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build ordering 
+    inputs:
+      dockerComposeCommand: 'build ordering.api ordering.backgroundtasks ordering.signalrhub'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push ordering
+    inputs:
+      dockerComposeCommand: 'push ordering.api ordering.backgroundtasks ordering.signalrhub'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build ordering 
+    inputs:
+      dockerComposeCommand: 'build ordering.api ordering.backgroundtasks ordering.signalrhub'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push ordering
+    inputs:
+      dockerComposeCommand: 'push ordering.api ordering.backgroundtasks ordering.signalrhub'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ 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 8518c8841..df82cf054 100644
--- a/build/azure-devops/payment-api/azure-pipelines.yml
+++ b/build/azure-devops/payment-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -12,34 +10,66 @@ trigger:
     - src/BuildingBlocks/*
     - src/Services/Payment/*
     - k8s/helm/payment-api/*  
-steps:
-- task: DockerCompose@0
-  displayName: Compose build payment
-  inputs:
-    dockerComposeCommand: 'build payment.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push payment
-  inputs:
-    dockerComposeCommand: 'push payment.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'    
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build payment
+    inputs:
+      dockerComposeCommand: 'build payment.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push payment
+    inputs:
+      dockerComposeCommand: 'push payment.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build payment
+    inputs:
+      dockerComposeCommand: 'build payment.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win 
+  - task: DockerCompose@0
+    displayName: Compose push payment
+    inputs:
+      dockerComposeCommand: 'push payment.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win 
\ 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 70a4df950..5ddbdad93 100644
--- a/build/azure-devops/web-shopping-agg/azure-pipelines.yml
+++ b/build/azure-devops/web-shopping-agg/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -10,35 +8,67 @@ trigger:
   paths:
     include:
     - src/ApiGateways/Web.Bff.Shopping/aggregator/*
-    - k8s/helm/webshoppingagg/*           
-steps:
-- task: DockerCompose@0
-  displayName: Compose build webshoppingagg
-  inputs:
-    dockerComposeCommand: 'build webshoppingagg'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push webshoppingagg
-  inputs:
-    dockerComposeCommand: 'push webshoppingagg'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/webshoppingagg/* 
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webshoppingagg
+    inputs:
+      dockerComposeCommand: 'build webshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push webshoppingagg
+    inputs:
+      dockerComposeCommand: 'push webshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webshoppingagg
+    inputs:
+      dockerComposeCommand: 'build webshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push webshoppingagg
+    inputs:
+      dockerComposeCommand: 'push webshoppingagg'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ 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 b48948111..e47263064 100644
--- a/build/azure-devops/webhooks-api/azure-pipelines.yml
+++ b/build/azure-devops/webhooks-api/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -11,35 +9,67 @@ trigger:
     include:
     - src/BuildingBlocks/*
     - src/Services/Webhooks/*
-    - k8s/helm/webhooks-api/*  
-steps:
-- task: DockerCompose@0
-  displayName: Compose build webhooks
-  inputs:
-    dockerComposeCommand: 'build webhooks.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push webhooks
-  inputs:
-    dockerComposeCommand: 'push webhooks.api'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/webhooks-api/*
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04' 
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webhooks
+    inputs:
+      dockerComposeCommand: 'build webhooks.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push webhooks
+    inputs:
+      dockerComposeCommand: 'push webhooks.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webhooks
+    inputs:
+      dockerComposeCommand: 'build webhooks.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push webhooks
+    inputs:
+      dockerComposeCommand: 'push webhooks.api'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ 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 71e3bbe16..c50aa073b 100644
--- a/build/azure-devops/webhooks-client/azure-pipelines.yml
+++ b/build/azure-devops/webhooks-client/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -11,35 +9,67 @@ trigger:
     include:
     - src/BuildingBlocks/*
     - src/Web/WebhookClient/*
-    - k8s/helm/webhooks-web/*      
-steps:
-- task: DockerCompose@0
-  displayName: Compose build webhooks.client
-  inputs:
-    dockerComposeCommand: 'build webhooks.client'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push webhooks.client
-  inputs:
-    dockerComposeCommand: 'push webhooks.client'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/webhooks-web/*  
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'    
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webhooks.client
+    inputs:
+      dockerComposeCommand: 'build webhooks.client'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push webhooks.client
+    inputs:
+      dockerComposeCommand: 'push webhooks.client'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webhooks.client
+    inputs:
+      dockerComposeCommand: 'build webhooks.client'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push webhooks.client
+    inputs:
+      dockerComposeCommand: 'push webhooks.client'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)v
+        PLATFORM=win
\ 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 66b8518fa..79634f260 100644
--- a/build/azure-devops/webmvc/azure-pipelines.yml
+++ b/build/azure-devops/webmvc/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -11,35 +9,67 @@ trigger:
     include:
     - src/BuildingBlocks/*
     - src/Web/WebMVC/*
-    - k8s/helm/webmvc/*        
-steps:
-- task: DockerCompose@0
-  displayName: Compose build webmvc
-  inputs:
-    dockerComposeCommand: 'build webmvc'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push webmvc
-  inputs:
-    dockerComposeCommand: 'push webmvc'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/webmvc/*    
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'    
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webmvc
+    inputs:
+      dockerComposeCommand: 'build webmvc'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push webmvc
+    inputs:
+      dockerComposeCommand: 'push webmvc'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webmvc
+    inputs:
+      dockerComposeCommand: 'build webmvc'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push webmvc
+    inputs:
+      dockerComposeCommand: 'push webmvc'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ 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 eee8cd25d..7f7618f70 100644
--- a/build/azure-devops/webspa/azure-pipelines.yml
+++ b/build/azure-devops/webspa/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -12,34 +10,66 @@ trigger:
     - src/BuildingBlocks/*
     - src/Web/WebSPA/*
     - k8s/helm/webspa/*            
-steps:
-- task: DockerCompose@0
-  displayName: Compose build webspa
-  inputs:
-    dockerComposeCommand: 'build webspa'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push webspa
-  inputs:
-    dockerComposeCommand: 'push webspa'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webspa
+    inputs:
+      dockerComposeCommand: 'build webspa'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push webspa
+    inputs:
+      dockerComposeCommand: 'push webspa'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webspa
+    inputs:
+      dockerComposeCommand: 'build webspa'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push webspa
+    inputs:
+      dockerComposeCommand: 'push webspa'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ 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 311c457e2..45d86607f 100644
--- a/build/azure-devops/webstatus/azure-pipelines.yml
+++ b/build/azure-devops/webstatus/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -11,35 +9,67 @@ trigger:
     include:
     - src/BuildingBlocks/*
     - src/Web/WebStatus/*
-    - k8s/helm/webstatus/*        
-steps:
-- task: DockerCompose@0
-  displayName: Compose build webstatus
-  inputs:
-    dockerComposeCommand: 'build webstatus'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
-  displayName: Compose push webstatus
-  inputs:
-    dockerComposeCommand: 'push webstatus'
-    containerregistrytype: Container Registry
-    dockerRegistryEndpoint: $(registryEndpoint)
-    dockerComposeFile: docker-compose.yml
-    qualifyImageNames: true
-    projectName: ""
-    dockerComposeFileArgs: |
-      TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
-  inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-    artifactName: helm
+    - k8s/helm/webstatus/* 
+jobs:
+- job: BuildLinux
+  pool:
+    vmImage: 'ubuntu-16.04'       
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webstatus
+    inputs:
+      dockerComposeCommand: 'build webstatus'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: DockerCompose@0
+    displayName: Compose push webstatus
+    inputs:
+      dockerComposeCommand: 'push webstatus'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build webstatus
+    inputs:
+      dockerComposeCommand: 'build webstatus'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push webstatus
+    inputs:
+      dockerComposeCommand: 'push webstatus'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
\ No newline at end of file