diff --git a/pkg/acsengine/template_generator.go b/pkg/acsengine/template_generator.go
index b60920e4ad..87b5b39436 100644
--- a/pkg/acsengine/template_generator.go
+++ b/pkg/acsengine/template_generator.go
@@ -222,12 +222,14 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 		"GetMasterKubernetesLabels": func(rg string) string {
 			var buf bytes.Buffer
 			buf.WriteString("kubernetes.io/role=master")
+			buf.WriteString(",node-role.kubernetes.io/master=")
 			buf.WriteString(fmt.Sprintf(",kubernetes.azure.com/cluster=%s", rg))
 			return buf.String()
 		},
 		"GetAgentKubernetesLabels": func(profile *api.AgentPoolProfile, rg string) string {
 			var buf bytes.Buffer
-			buf.WriteString(fmt.Sprintf("kubernetes.io/role=agent,agentpool=%s", profile.Name))
+			buf.WriteString("node-role.kubernetes.io/agent=")
+			buf.WriteString(fmt.Sprintf(",kubernetes.io/role=agent,agentpool=%s", profile.Name))
 			if profile.StorageProfile == api.ManagedDisks {
 				storagetier, _ := getStorageAccountType(profile.VMSize)
 				buf.WriteString(fmt.Sprintf(",storageprofile=managed,storagetier=%s", storagetier))