diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml
index adf00e4d0..6fedf33a6 100644
--- a/build/azure-devops/apigws/azure-pipelines.yml
+++ b/build/azure-devops/apigws/azure-pipelines.yml
@@ -50,31 +50,3 @@ jobs:
     inputs:
       pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
       artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'vs2017-win2016'
-  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
diff --git a/scripts/restore-packages.cmd b/scripts/restore-packages.cmd
new file mode 100644
index 000000000..9f3a8434e
--- /dev/null
+++ b/scripts/restore-packages.cmd
@@ -0,0 +1 @@
+for %%p in (csproj-files\*.csproj) do dotnet restore %%p