diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 941cc4cf1b..95f93bc08c 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -20,7 +20,6 @@ stages:
               go version
               echo "##vso[task.setvariable variable=commitID;isOutput=true]$(echo $(make revision)-$(date "+%d%H%M"))"
               echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$(make npm-version)"
-              echo "##vso[task.setvariable variable=cnsVersion;isOutput=true]$(CNS_VERSION)"
             name: "SetEnvVars"
             displayName: "Set Environment Variables"
             condition: always()
@@ -51,6 +50,14 @@ stages:
               arch: amd64
               name: cni
               os: windows
+            cns_linux_amd64:
+              arch: amd64
+              name: cns
+              os: linux
+            cns_windows_amd64:
+              arch: amd64
+              name: cns
+              os: windows
             ipv6_hp_bpf_linux_amd64:
               arch: amd64
               name: ipv6-hp-bpf
@@ -75,22 +82,26 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
         strategy:
           matrix:
-            azure_ipam_linux_arm64:
-              arch: arm64
-              name: azure-ipam
-              os: linux
-            cni_linux_arm64:
-              arch: arm64
-              name: cni
-              os: linux
-            ipv6_hp_bpf_linux_arm64:
-              arch: arm64
-              name: ipv6-hp-bpf
-              os: linux
-            npm_linux_arm64:
-              arch: arm64
-              name: npm
-              os: linux
+              azure_ipam_linux_arm64:
+                arch: arm64
+                name: azure-ipam
+                os: linux
+              cni_linux_arm64:
+                arch: arm64
+                name: cni
+                os: linux
+              cns_linux_arm64:
+                arch: arm64
+                name: cns
+                os: linux
+              ipv6_hp_bpf_linux_arm64:
+                arch: arm64
+                name: ipv6-hp-bpf
+                os: linux
+              npm_linux_arm64:
+                arch: arm64
+                name: npm
+                os: linux
         steps:
           - template: ../containers/container-template.yaml
             parameters:
@@ -147,6 +158,9 @@ stages:
             cni:
               name: cni
               platforms: linux/amd64 linux/arm64 windows/amd64
+            cns:
+              name: cns
+              platforms: linux/amd64 linux/arm64 windows/amd64
             ipv6-hp-bpf:
               name: ipv6-hp-bpf
               platforms: linux/amd64 linux/arm64