diff --git a/.pipelines/containers/container-template-windows.yaml b/.pipelines/containers/container-template-windows.yaml
index 9f1ec05245..7e25a44872 100644
--- a/.pipelines/containers/container-template-windows.yaml
+++ b/.pipelines/containers/container-template-windows.yaml
@@ -2,6 +2,10 @@ parameters:
   name: ""
   arch: ""
   tag: ""
+  ai_path: ""
+  ai_path_var: ""
+  ai_id: ""
+  ai_id_var: ""
 
 steps:
 - task: Docker@2
@@ -11,19 +15,29 @@ steps:
     command: 'login'
     addPipelineData: false
 
-- powershell: |
-    echo "using tag ${{ parameters.tag }}"
-    . .\build\scripts\windows.ps1; ${{ parameters.name }}-image windows-${{ parameters.arch }}-${{ parameters.tag }} 
-  name: image_build
+- task: Docker@2
   displayName: Image Build
-  retryCountOnTaskFailure: 3  
+  retryCountOnTaskFailure: 3
+  inputs:
+    command: 'build'
+    containerRegistry: $(ACR_SERVICE_CONNECTION)
+    repository: 'azure-${{ parameters.name }}'
+    tags: 'windows-${{ parameters.arch }}-${{ parameters.tag }}'
+    Dockerfile: '${{ parameters.name }}/windows.Dockerfile'
+    arguments: '
+    --build-arg VERSION=windows-${{ parameters.arch }}-${{ parameters.tag }} 
+    --build-arg ${{ parameters.ai_path_var }}=${{ parameters.ai_path }} 
+    --build-arg ${{ parameters.ai_id_var }}=${{ parameters.ai_id }}'
+    buildContext: '**/..'
 
-- powershell: |
-    $registry = "acnpublic.azurecr.io"
-    docker push $registry/azure-${{ parameters.name }}:windows-${{ parameters.arch }}-${{ parameters.tag }}
-  name: image_push
+- task: Docker@2
   displayName: Image Push
   retryCountOnTaskFailure: 3
+  inputs:
+    command: 'push'
+    containerRegistry: $(ACR_SERVICE_CONNECTION)
+    repository: 'azure-${{ parameters.name }}'
+    tags: 'windows-${{ parameters.arch }}-${{ parameters.tag }}'
 
 - task: Docker@2
   displayName: Logout
diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 556a9724ae..b097653d8b 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -71,12 +71,20 @@ jobs:
         npm_windows_amd64:
           arch: amd64
           name: npm
+          ai_path: github.com/Azure/azure-container-networking/npm.aiMetadata
+          ai_path_var: NPM_AI_PATH
+          ai_id: 014c22bd-4107-459e-8475-67909e96edcb
+          ai_id_var: NPM_AI_ID
     steps:
       - template: ../containers/container-template-windows.yaml
         parameters:
           name: $(name)
           arch: $(arch)
           tag: $(TAG)
+          ai_path: $(ai_path)
+          ai_path_var: $(ai_path_var)
+          ai_id: $(ai_id)
+          ai_id_var: $(ai_id_var)
 
   - job: k8se2e
     displayName: "Build Kubernetes Test Suite"
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index 700ae38007..4b838c99a4 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -230,14 +230,26 @@ stages:
             cns_windows_amd64:
               arch: amd64
               name: cns
+              ai_path: github.com/Azure/azure-container-networking/cns/logger.aiMetadata
+              ai_path_var: CNS_AI_PATH
+              ai_id: ce672799-8f08-4235-8c12-08563dc2acef
+              ai_id_var: CNS_AI_ID
             npm_windows_amd64:
               arch: amd64
               name: npm
+              ai_path: github.com/Azure/azure-container-networking/npm.aiMetadata
+              ai_path_var: NPM_AI_PATH
+              ai_id: 014c22bd-4107-459e-8475-67909e96edcb
+              ai_id_var: NPM_AI_ID
         steps:
           - template: containers/container-template-windows.yaml
             parameters:
               name: $(name)
               arch: $(arch)
+              ai_path: $(ai_path)
+              ai_path_var: $(ai_path_var)
+              ai_id: $(ai_id)
+              ai_id_var: $(ai_id_var)
               tag: $(TAG)
       - job: check_tag
         displayName: Check Tag
diff --git a/.pipelines/submodules-pipeline.yaml b/.pipelines/submodules-pipeline.yaml
index 2de9b30a42..eff462eeac 100644
--- a/.pipelines/submodules-pipeline.yaml
+++ b/.pipelines/submodules-pipeline.yaml
@@ -199,15 +199,27 @@ stages:
             cns_windows_amd64:
               arch: amd64
               name: cns
+              ai_path: github.com/Azure/azure-container-networking/cns/logger.aiMetadata
+              ai_path_var: CNS_AI_PATH
+              ai_id: ce672799-8f08-4235-8c12-08563dc2acef
+              ai_id_var: CNS_AI_ID
             npm_windows_amd64:
               arch: amd64
               name: npm
+              ai_path: github.com/Azure/azure-container-networking/npm.aiMetadata
+              ai_path_var: NPM_AI_PATH
+              ai_id: 014c22bd-4107-459e-8475-67909e96edcb
+              ai_id_var: NPM_AI_ID
         steps:
           - template: containers/container-template-windows.yaml
             parameters:
               name: $(name)
               arch: $(arch)
               tag: $(TAG)
+              ai_path: $(ai_path)
+              ai_path_var: $(ai_path_var)
+              ai_id: $(ai_id)
+              ai_id_var: $(ai_id_var)
 
   - stage: publish
     displayName: Publish Multiarch Manifests