diff --git a/.pipelines/run-pipeline.yaml b/.pipelines/run-pipeline.yaml
index 6b524a530b..814ec9ab16 100644
--- a/.pipelines/run-pipeline.yaml
+++ b/.pipelines/run-pipeline.yaml
@@ -44,321 +44,459 @@ stages:
 
 - template: templates/run-unit-tests.stages.yaml@acn-devops
 
-- stage: build
-  displayName: "Build Project"
-  dependsOn:
-    - setup
-    - unittest
-  variables:
-    ACN_DIR: drop_setup_env_source
-    ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
-    CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
-    CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
-    NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
-
-    STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-    TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
-
-    IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
-    AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
-    AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
-    CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-    CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-    IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
-    NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
-  jobs:
-  - template: /.pipelines/build/images.jobs.yaml@acn-devops
-    parameters:
-      images:
-      - job: linux_amd64
-        displayName: "Linux/AMD64"
-        templateContext:
-          repositoryArtifact: drop_setup_env_source
-          buildScript: .pipelines/build/scripts/$(name).sh
-          obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
-        strategy:
-          maxParallel: 5
-          matrix:
-            azure_ipam:
-              name: azure-ipam
-              extraArgs: ''
-              archiveName: azure-ipam
-              archiveVersion: $(AZURE_IPAM_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            azure_ip_masq_merger:
-              name: azure-ip-masq-merger
-              extraArgs: ''
-              archiveName: azure-ip-masq-merger
-              archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
-              imageTag: $(Build.BuildNumber)
-            cni:
-              name: cni
-              extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
-              archiveName: azure-cni
-              archiveVersion: $(CNI_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cns:
-              name: cns
-              extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
-              archiveName: azure-cns
-              archiveVersion: $(CNS_VERSION)
-              imageTag: $(Build.BuildNumber)
-            ipv6_hp_bpf:
-              name: ipv6-hp-bpf
-              extraArgs: "--build-arg DEBUG=$(System.Debug)"
-              archiveName: ipv6-hp-bpf
-              archiveVersion: $(IPV6_HP_BPF_VERSION)
-              imageTag: $(Build.BuildNumber)
-            npm:
-              name: npm
-              extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-              archiveName: azure-npm
-              archiveVersion: $(NPM_VERSION)
-              imageTag: $(Build.BuildNumber)
-
-      - job: windows_amd64
-        displayName: "Windows"
-        templateContext:
-          repositoryArtifact: drop_setup_env_source
-          buildScript: .pipelines/build/scripts/$(name).sh
-          obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
-        strategy:
-          maxParallel: 5
-          matrix:
-            azure_ipam:
-              name: azure-ipam
-              extraArgs: ''
-              archiveName: azure-ipam
-              archiveVersion: $(AZURE_IPAM_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cni:
-              name: cni
-              extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
-              archiveName: azure-cni
-              archiveVersion: $(CNI_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cns:
-              name: cns
-              extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
-              archiveName: azure-cns
-              archiveVersion: $(CNS_VERSION)
-              imageTag: $(Build.BuildNumber)
-            npm:
-              name: npm
-              extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-              archiveName: azure-npm
-              archiveVersion: $(NPM_VERSION)
-              imageTag: $(Build.BuildNumber)
-
-      - job: linux_arm64
-        displayName: "Linux/ARM64"
-        templateContext:
-          repositoryArtifact: drop_setup_env_source
-          buildScript: .pipelines/build/scripts/$(name).sh
-          obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
-        strategy:
-          maxParallel: 3
-          matrix:
-            azure_ipam:
-              name: azure-ipam
-              archiveName: azure-ipam
-              archiveVersion: $(AZURE_IPAM_VERSION)
-              extraArgs: ''
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            azure_ip_masq_merger:
-              name: azure-ip-masq-merger
-              extraArgs: ''
-              archiveName: azure-ip-masq-merger
-              archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
-              imageTag: $(Build.BuildNumber)
-            cni:
-              name: cni
-              extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
-              archiveName: azure-cni
-              archiveVersion: $(CNI_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cns:
-              name: cns
-              extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
-              archiveName: azure-cns
-              archiveVersion: $(CNS_VERSION)
-              imageTag: $(Build.BuildNumber)
-            ipv6_hp_bpf:
-              name: ipv6-hp-bpf
-              extraArgs: "--build-arg DEBUG=$(System.Debug)"
-              archiveName: ipv6-hp-bpf
-              archiveVersion: $(IPV6_HP_BPF_VERSION)
-              imageTag: $(Build.BuildNumber)
-            npm:
-              name: npm
-              extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-              archiveName: azure-npm
-              archiveVersion: $(NPM_VERSION)
-              imageTag: $(Build.BuildNumber)
-
-- stage: build
-  displayName: "Build Project"
-  dependsOn:
-    - setup
-    - unittest
-  variables:
-    ACN_DIR: drop_setup_env_source
-    ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
-    CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
-    CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
-    NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
-
-    STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-    TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
-
-    IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
-    AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
-    AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
-    CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
-    CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
-    IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
-    NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
-  jobs:
-  - template: /.pipelines/build/images.jobs.yaml
-    parameters:
-      images:
-      - job: linux_amd64
-        displayName: "Linux/AMD64"
-        templateContext:
-          repositoryArtifact: drop_setup_env_source
-          buildScript: .pipelines/build/scripts/$(name).sh
-          obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
-        strategy:
-          maxParallel: 5
-          matrix:
-            azure_ipam:
-              name: azure-ipam
-              extraArgs: ''
-              archiveName: azure-ipam
-              archiveVersion: $(AZURE_IPAM_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            azure_ip_masq_merger:
-              name: azure-ip-masq-merger
-              extraArgs: ''
-              archiveName: azure-ip-masq-merger
-              archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
-              imageTag: $(Build.BuildNumber)
-            cni:
-              name: cni
-              extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
-              archiveName: azure-cni
-              archiveVersion: $(CNI_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cns:
-              name: cns
-              extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
-              archiveName: azure-cns
-              archiveVersion: $(CNS_VERSION)
-              imageTag: $(Build.BuildNumber)
-            ipv6_hp_bpf:
-              name: ipv6-hp-bpf
-              extraArgs: "--build-arg DEBUG=$(System.Debug)"
-              archiveName: ipv6-hp-bpf
-              archiveVersion: $(IPV6_HP_BPF_VERSION)
-              imageTag: $(Build.BuildNumber)
-            # npm:
-            #   name: npm
-            #   extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-            #   archiveName: azure-npm
-            #   archiveVersion: $(NPM_VERSION)
-            #   imageTag: $(Build.BuildNumber)
-
-      - job: windows_amd64
-        displayName: "Windows"
-        templateContext:
-          repositoryArtifact: drop_setup_env_source
-          buildScript: .pipelines/build/scripts/$(name).sh
-          obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
-        strategy:
-          maxParallel: 5
-          matrix:
-            azure_ipam:
-              name: azure-ipam
-              extraArgs: ''
-              archiveName: azure-ipam
-              archiveVersion: $(AZURE_IPAM_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cni:
-              name: cni
-              extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
-              archiveName: azure-cni
-              archiveVersion: $(CNI_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cns:
-              name: cns
-              extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
-              archiveName: azure-cns
-              archiveVersion: $(CNS_VERSION)
-              imageTag: $(Build.BuildNumber)
-            # npm:
-            #   name: npm
-            #   extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-            #   archiveName: azure-npm
-            #   archiveVersion: $(NPM_VERSION)
-            #   imageTag: $(Build.BuildNumber)
-
-      - job: linux_arm64
-        displayName: "Linux/ARM64"
-        templateContext:
-          repositoryArtifact: drop_setup_env_source
-          buildScript: .pipelines/build/scripts/$(name).sh
-          obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
-        strategy:
-          maxParallel: 3
-          matrix:
-            azure_ipam:
-              name: azure-ipam
-              archiveName: azure-ipam
-              archiveVersion: $(AZURE_IPAM_VERSION)
-              extraArgs: ''
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            azure_ip_masq_merger:
-              name: azure-ip-masq-merger
-              extraArgs: ''
-              archiveName: azure-ip-masq-merger
-              archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
-              imageTag: $(Build.BuildNumber)
-            cni:
-              name: cni
-              extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
-              archiveName: azure-cni
-              archiveVersion: $(CNI_VERSION)
-              imageTag: $(Build.BuildNumber)
-              packageWithDropGZ: True
-            cns:
-              name: cns
-              extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
-              archiveName: azure-cns
-              archiveVersion: $(CNS_VERSION)
-              imageTag: $(Build.BuildNumber)
-            ipv6_hp_bpf:
-              name: ipv6-hp-bpf
-              extraArgs: "--build-arg DEBUG=$(System.Debug)"
-              archiveName: ipv6-hp-bpf
-              archiveVersion: $(IPV6_HP_BPF_VERSION)
-              imageTag: $(Build.BuildNumber)
-            # npm:
-            #   name: npm
-            #   extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-            #   archiveName: azure-npm
-            #   archiveVersion: $(NPM_VERSION)
-            #   imageTag: $(Build.BuildNumber)
+- ${{ if contains(parameters.triggerBuildSourceBranch, 'v1.7') }}:
+  - stage: build
+    displayName: "Build Project"
+    dependsOn:
+      - setup
+      - unittest
+    variables:
+      ACN_DIR: drop_setup_env_source
+      ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
+      CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
+      CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
+      NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
+
+      STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+
+      IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
+      AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
+      NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
+    jobs:
+    - template: /.pipelines/build/images.jobs.yaml@acn-devops
+      parameters:
+        images:
+        - job: linux_amd64
+          displayName: "Linux/AMD64"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 5
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                extraArgs: ''
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              azure_ip_masq_merger:
+                name: azure-ip-masq-merger
+                extraArgs: ''
+                archiveName: azure-ip-masq-merger
+                archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
+                imageTag: $(Build.BuildNumber)
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              ipv6_hp_bpf:
+                name: ipv6-hp-bpf
+                extraArgs: "--build-arg DEBUG=$(System.Debug)"
+                archiveName: ipv6-hp-bpf
+                archiveVersion: $(IPV6_HP_BPF_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+        - job: windows_amd64
+          displayName: "Windows"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 5
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                extraArgs: ''
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+        - job: linux_arm64
+          displayName: "Linux/ARM64"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 3
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                extraArgs: ''
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              azure_ip_masq_merger:
+                name: azure-ip-masq-merger
+                extraArgs: ''
+                archiveName: azure-ip-masq-merger
+                archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
+                imageTag: $(Build.BuildNumber)
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              ipv6_hp_bpf:
+                name: ipv6-hp-bpf
+                extraArgs: "--build-arg DEBUG=$(System.Debug)"
+                archiveName: ipv6-hp-bpf
+                archiveVersion: $(IPV6_HP_BPF_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+- ${{ if contains(parameters.triggerBuildSourceBranch, 'v1.6') }}:
+  - stage: build
+    displayName: "Build Project"
+    dependsOn:
+      - setup
+      - unittest
+    variables:
+      ACN_DIR: drop_setup_env_source
+      ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
+      CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
+      CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
+      NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
+
+      STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+
+      IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
+      AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
+      NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
+    jobs:
+    - template: /.pipelines/build/images.jobs.yaml@acn-devops
+      parameters:
+        images:
+        - job: linux_amd64
+          displayName: "Linux/AMD64"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 5
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                extraArgs: ''
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              ipv6_hp_bpf:
+                name: ipv6-hp-bpf
+                extraArgs: "--build-arg DEBUG=$(System.Debug)"
+                archiveName: ipv6-hp-bpf
+                archiveVersion: $(IPV6_HP_BPF_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+        - job: windows_amd64
+          displayName: "Windows"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 5
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                extraArgs: ''
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+        - job: linux_arm64
+          displayName: "Linux/ARM64"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 3
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                extraArgs: ''
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              ipv6_hp_bpf:
+                name: ipv6-hp-bpf
+                extraArgs: "--build-arg DEBUG=$(System.Debug)"
+                archiveName: ipv6-hp-bpf
+                archiveVersion: $(IPV6_HP_BPF_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+- ${{ if contains(parameters.triggerBuildSourceBranch, 'v1.5') }}:
+  - stage: build
+    displayName: "Build Project"
+    dependsOn:
+      - setup
+      - unittest
+    variables:
+      ACN_DIR: drop_setup_env_source
+      ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
+      CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
+      CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
+      NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata
+
+      STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+
+      IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
+      AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
+      AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
+      CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
+      CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+      IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
+      NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
+    jobs:
+    - template: /.pipelines/build/images.jobs.yaml@acn-devops
+      parameters:
+        images:
+        - job: linux_amd64
+          displayName: "Linux/AMD64"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 5
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                extraArgs: ''
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              ipv6_hp_bpf:
+                name: ipv6-hp-bpf
+                extraArgs: "--build-arg DEBUG=$(System.Debug)"
+                archiveName: ipv6-hp-bpf
+                archiveVersion: $(IPV6_HP_BPF_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+        - job: windows_amd64
+          displayName: "Windows"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 5
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                extraArgs: ''
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
+        - job: linux_arm64
+          displayName: "Linux/ARM64"
+          templateContext:
+            repositoryArtifact: drop_setup_env_source
+            buildScript: .pipelines/build/scripts/$(name).sh
+            obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
+          strategy:
+            maxParallel: 3
+            matrix:
+              azure_ipam:
+                name: azure-ipam
+                archiveName: azure-ipam
+                archiveVersion: $(AZURE_IPAM_VERSION)
+                extraArgs: ''
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cni:
+                name: cni
+                extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
+                archiveName: azure-cni
+                archiveVersion: $(CNI_VERSION)
+                imageTag: $(Build.BuildNumber)
+                packageWithDropGZ: True
+              cns:
+                name: cns
+                extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
+                archiveName: azure-cns
+                archiveVersion: $(CNS_VERSION)
+                imageTag: $(Build.BuildNumber)
+              ipv6_hp_bpf:
+                name: ipv6-hp-bpf
+                extraArgs: "--build-arg DEBUG=$(System.Debug)"
+                archiveName: ipv6-hp-bpf
+                archiveVersion: $(IPV6_HP_BPF_VERSION)
+                imageTag: $(Build.BuildNumber)
+              npm:
+                name: npm
+                extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+                archiveName: azure-npm
+                archiveVersion: $(NPM_VERSION)
+                imageTag: $(Build.BuildNumber)
+
 
 
 - ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}: