diff --git a/upup/models/bindata.go b/upup/models/bindata.go
index bfc5236431ef7..dfc9538f6e6ae 100644
--- a/upup/models/bindata.go
+++ b/upup/models/bindata.go
@@ -1281,7 +1281,7 @@ spec:
           - --logtostderr=true
           - --v=2
       nodeSelector:
-        kubernetes.io/arch: amd64
+        kubernetes.io/role: master
       priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
@@ -2706,7 +2706,7 @@ spec:
           - --logtostderr=true
           - --v=2
       nodeSelector:
-        kubernetes.io/arch: amd64
+        kubernetes.io/role: master
       priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
@@ -3062,9 +3062,13 @@ spec:
           - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
           - --logtostderr=true
           - --v=2
+      nodeSelector:
+        kubernetes.io/role: master
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"
+      - key: node-role.kubernetes.io/master
+        operator: Exists
       serviceAccountName: kube-dns-autoscaler
 
 ---
diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
index 9dedbc99cc4d1..8df5e3a223b94 100644
--- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
+++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
@@ -119,7 +119,7 @@ spec:
           - --logtostderr=true
           - --v=2
       nodeSelector:
-        kubernetes.io/arch: amd64
+        kubernetes.io/role: master
       priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
index 3ce5ee5bab5a1..31e6380367740 100644
--- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
+++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
@@ -70,7 +70,7 @@ spec:
           - --logtostderr=true
           - --v=2
       nodeSelector:
-        kubernetes.io/arch: amd64
+        kubernetes.io/role: master
       priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
index b7c8e5ba9987e..907ce3092cd43 100644
--- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
@@ -68,9 +68,13 @@ spec:
           - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
           - --logtostderr=true
           - --v=2
+      nodeSelector:
+        kubernetes.io/role: master
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"
+      - key: node-role.kubernetes.io/master
+        operator: Exists
       serviceAccountName: kube-dns-autoscaler
 
 ---
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
index 7c2797b1b6b29..5860e84304add 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -21,7 +21,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
+    manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
@@ -29,7 +29,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
+    manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
index 2500f1209bf2c..741ccda1a2252 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -21,7 +21,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
+    manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
@@ -29,7 +29,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
+    manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index 55f2c98481919..5882b61ecbd3d 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -21,7 +21,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
+    manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
@@ -29,7 +29,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
+    manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
index b52ba51890480..a44bf5831a122 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
@@ -21,7 +21,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
+    manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
@@ -29,7 +29,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
+    manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io