diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml
index 6fedf33a6..01206cec3 100644
--- a/build/azure-devops/apigws/azure-pipelines.yml
+++ b/build/azure-devops/apigws/azure-pipelines.yml
@@ -41,7 +41,7 @@ jobs:
       qualifyImageNames: true
       projectName: ""
       dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)        
+        TAG=$(Build.SourceBranchName) 
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
@@ -50,3 +50,31 @@ jobs:
     inputs:
       pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
       artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build apigws
+    inputs:
+      dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win      
+  - task: DockerCompose@0
+    displayName: Compose push apigws
+    inputs:
+      dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win      
\ No newline at end of file