diff --git a/parts/k8s/addons/azure-cni-networkmonitor.yaml b/parts/k8s/addons/azure-cni-networkmonitor.yaml
index 7f332639ae..5dadb5c99c 100644
--- a/parts/k8s/addons/azure-cni-networkmonitor.yaml
+++ b/parts/k8s/addons/azure-cni-networkmonitor.yaml
@@ -40,11 +40,7 @@ spec:
       - operator: "Exists"
         effect: NoSchedule
       nodeSelector:
-{{- if IsKubernetesVersionGe "1.19.0-alpha.2"}}
         kubernetes.io/os: linux
-{{else}}
-        kubernetes.io/os: linux
-{{- end}}
       containers:
         - name: azure-cnms
           image: {{ContainerImage "azure-cni-networkmonitor"}}
diff --git a/parts/k8s/addons/cluster-autoscaler.yaml b/parts/k8s/addons/cluster-autoscaler.yaml
index 94520934b5..1793fd1aff 100644
--- a/parts/k8s/addons/cluster-autoscaler.yaml
+++ b/parts/k8s/addons/cluster-autoscaler.yaml
@@ -179,16 +179,8 @@ spec:
         value: "true"
         key: node-role.kubernetes.io/master
       nodeSelector:
-{{- if IsKubernetesVersionGe "1.16.0"}}
-        kubernetes.azure.com/role: master
-{{else}}
-        kubernetes.io/role: master
-{{- end}}
-{{- if IsKubernetesVersionGe "1.19.0-alpha.2"}}
+        kubernetes.{{if IsKubernetesVersionGe "1.16.0"}}azure.com{{else}}io{{end}}/role: master
         kubernetes.io/os: linux
-{{else}}
-        kubernetes.io/os: linux
-{{- end}}
       containers:
       - image: {{ContainerImage "cluster-autoscaler"}}
         imagePullPolicy: IfNotPresent
diff --git a/parts/k8s/addons/coredns.yaml b/parts/k8s/addons/coredns.yaml
index 3fad192a32..623f00f976 100644
--- a/parts/k8s/addons/coredns.yaml
+++ b/parts/k8s/addons/coredns.yaml
@@ -156,7 +156,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
         {{- if ContainerConfig "use-host-network"}}
-        kubernetes.azure.com/role: agent
+        kubernetes.{{if IsKubernetesVersionGe "1.16.0"}}azure.com{{else}}io{{end}}/role: agent
         {{end}}
       containers:
       - name: coredns
diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
index 6ce7f9c35e..a42186bd17 100644
--- a/pkg/engine/templates_generated.go
+++ b/pkg/engine/templates_generated.go
@@ -8754,11 +8754,7 @@ spec:
       - operator: "Exists"
         effect: NoSchedule
       nodeSelector:
-{{- if IsKubernetesVersionGe "1.19.0-alpha.2"}}
         kubernetes.io/os: linux
-{{else}}
-        kubernetes.io/os: linux
-{{- end}}
       containers:
         - name: azure-cnms
           image: {{ContainerImage "azure-cni-networkmonitor"}}
@@ -13932,16 +13928,8 @@ spec:
         value: "true"
         key: node-role.kubernetes.io/master
       nodeSelector:
-{{- if IsKubernetesVersionGe "1.16.0"}}
-        kubernetes.azure.com/role: master
-{{else}}
-        kubernetes.io/role: master
-{{- end}}
-{{- if IsKubernetesVersionGe "1.19.0-alpha.2"}}
-        kubernetes.io/os: linux
-{{else}}
+        kubernetes.{{if IsKubernetesVersionGe "1.16.0"}}azure.com{{else}}io{{end}}/role: master
         kubernetes.io/os: linux
-{{- end}}
       containers:
       - image: {{ContainerImage "cluster-autoscaler"}}
         imagePullPolicy: IfNotPresent
@@ -14835,7 +14823,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
         {{- if ContainerConfig "use-host-network"}}
-        kubernetes.azure.com/role: agent
+        kubernetes.{{if IsKubernetesVersionGe "1.16.0"}}azure.com{{else}}io{{end}}/role: agent
         {{end}}
       containers:
       - name: coredns
diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
index a0bd3dd730..989aefb9c7 100644
--- a/test/e2e/kubernetes/kubernetes_test.go
+++ b/test/e2e/kubernetes/kubernetes_test.go
@@ -1595,7 +1595,12 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 				nodes, err := node.GetReadyWithRetry(1*time.Second, cfg.Timeout)
 				Expect(err).NotTo(HaveOccurred())
 				for _, n := range nodes {
-					role := n.Metadata.Labels["kubernetes.io/role"]
+					var role string
+					if common.IsKubernetesVersionGe(eng.ExpandedDefinition.Properties.OrchestratorProfile.OrchestratorVersion, "1.16.0") {
+						role = n.Metadata.Labels["kubernetes.azure.com/role"]
+					} else {
+						role = n.Metadata.Labels["kubernetes.io/role"]
+					}
 					if role == "master" {
 						By("Ensuring that we get zones for each master node")
 						zones := n.Metadata.Labels["failure-domain.beta.kubernetes.io/zone"]
@@ -1615,7 +1620,12 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 				nodes, err := node.GetReadyWithRetry(1*time.Second, cfg.Timeout)
 				Expect(err).NotTo(HaveOccurred())
 				for _, n := range nodes {
-					role := n.Metadata.Labels["kubernetes.io/role"]
+					var role string
+					if common.IsKubernetesVersionGe(eng.ExpandedDefinition.Properties.OrchestratorProfile.OrchestratorVersion, "1.16.0") {
+						role = n.Metadata.Labels["kubernetes.azure.com/role"]
+					} else {
+						role = n.Metadata.Labels["kubernetes.io/role"]
+					}
 					if role == "agent" {
 						By("Ensuring that we get zones for each agent node")
 						zones := n.Metadata.Labels["failure-domain.beta.kubernetes.io/zone"]