diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 5dc7aa3344d1319aeea54e9203c852aa95a3b65c..31f577c10569b8841fa3712a044bcd971b15fc69 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -181,9 +181,9 @@ dnsmasq_sidecar_image_tag: "{{ kubedns_version }}"
 dnsmasqautoscaler_version: 1.1.2
 dnsmasqautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-{{ image_arch }}"
 dnsmasqautoscaler_image_tag: "{{ dnsmasqautoscaler_version }}"
-kubednsautoscaler_version: 1.2.0
-kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-{{ image_arch }}"
-kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}"
+dnsautoscaler_version: 1.2.0
+dnsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-{{ image_arch }}"
+dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}"
 test_image_repo: busybox
 test_image_tag: latest
 busybox_image_repo: busybox
@@ -487,12 +487,12 @@ downloads:
     groups:
       - kube-node
 
-  kubednsautoscaler:
-    enabled: "{{ dns_mode in ['kubedns', 'dnsmasq_kubedns'] }}"
+  dnsautoscaler:
+    enabled: "{{ dns_mode in ['kubedns', 'dnsmasq_kubedns','coredns', 'coredns_dual'] }}"
     container: true
-    repo: "{{ kubednsautoscaler_image_repo }}"
-    tag: "{{ kubednsautoscaler_image_tag }}"
-    sha256: "{{ kubednsautoscaler_digest_checksum|default(None) }}"
+    repo: "{{ dnsautoscaler_image_repo }}"
+    tag: "{{ dnsautoscaler_image_tag }}"
+    sha256: "{{ dnsautoscaler_digest_checksum|default(None) }}"
     groups:
       - kube-node
 
diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml
index 0d6a50a17a849453d3ccf3a4fa6fd93963e7e34b..ff2bbd3f23ad90f36c54d92bf70ae6fa540c849a 100644
--- a/roles/kubernetes-apps/ansible/defaults/main.yml
+++ b/roles/kubernetes-apps/ansible/defaults/main.yml
@@ -7,11 +7,8 @@ kubednsautoscaler_version: 1.2.0
 dns_memory_limit: 170Mi
 dns_cpu_requests: 100m
 dns_memory_requests: 70Mi
-kubedns_min_replicas: 2
-kubedns_nodes_per_replica: 10
-
-# CoreDNS
-coredns_replicas: 2
+dns_min_replicas: 2
+dns_nodes_per_replica: 10
 
 # Images
 image_arch: "{{host_architecture}}"
@@ -22,8 +19,8 @@ dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-{{ ima
 dnsmasq_nanny_image_tag: "{{ kubedns_version }}"
 dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-{{ image_arch }}"
 dnsmasq_sidecar_image_tag: "{{ kubedns_version }}"
-kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-{{ image_arch }}"
-kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}"
+dnsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-{{ image_arch }}"
+dnsautoscaler_image_tag: "{{ kubednsautoscaler_version }}"
 
 # Netchecker
 deploy_netchecker: false
diff --git a/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml b/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml
index a369e842e549220c342135642f821cb2d6874b31..fdb7bfca5c45b6ed5a46bba982091c819344042b 100644
--- a/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml
+++ b/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml
@@ -54,3 +54,13 @@
     - kubeadm_init is defined
     - kubeadm_init.changed|default(false)
     - inventory_hostname == groups['kube-master'][0]
+
+- name: Kubernetes Apps | Delete old KubeDNS Autoscaler deployment
+  kube:
+    name: "kubedns-autoscaler"
+    namespace: "kube-system"
+    kubectl: "{{ bin_dir }}/kubectl"
+    resource: "deploy"
+    state: absent
+  tags:
+    - upgrade
diff --git a/roles/kubernetes-apps/ansible/tasks/coredns.yml b/roles/kubernetes-apps/ansible/tasks/coredns.yml
index c52cf7ba8fc9cacef4017c83ec01f4f522059a40..ba1cb31d6a4a58fab25237e7674c108da528a086 100644
--- a/roles/kubernetes-apps/ansible/tasks/coredns.yml
+++ b/roles/kubernetes-apps/ansible/tasks/coredns.yml
@@ -10,6 +10,10 @@
     - { name: coredns, file: coredns-svc.yml, type: svc }
     - { name: coredns, file: coredns-clusterrole.yml, type: clusterrole }
     - { name: coredns, file: coredns-clusterrolebinding.yml, type: clusterrolebinding }
+    - { name: dns-autoscaler, file: dns-autoscaler-sa.yml, type: sa }
+    - { name: dns-autoscaler, file: dns-autoscaler-clusterrole.yml, type: clusterrole }
+    - { name: dns-autoscaler, file: dns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
+    - { name: dns-autoscaler, file: dns-autoscaler.yml, type: deployment }
   register: coredns_manifests
   vars:
     clusterIP: "{{ skydns_server }}"
@@ -26,6 +30,7 @@
   with_items:
     - { name: coredns, src: coredns-deployment.yml, file: coredns-deployment-secondary.yml, type: deployment }
     - { name: coredns, src: coredns-svc.yml, file: coredns-svc-secondary.yml, type: svc }
+    - { name: dns-autoscaler, src: dns-autoscaler.yml, file: coredns-autoscaler-secondary.yml, type: deployment }
   register: coredns_secondary_manifests
   vars:
     clusterIP: "{{ skydns_server_secondary }}"
diff --git a/roles/kubernetes-apps/ansible/tasks/kubedns.yml b/roles/kubernetes-apps/ansible/tasks/kubedns.yml
index cc805778b0d595ff9096b8fde653ec114d46fb2f..99a35769892b7808f2a8a434ee5f91ec5185e712 100644
--- a/roles/kubernetes-apps/ansible/tasks/kubedns.yml
+++ b/roles/kubernetes-apps/ansible/tasks/kubedns.yml
@@ -8,10 +8,10 @@
     - { name: kube-dns, file: kubedns-sa.yml, type: sa }
     - { name: kube-dns, file: kubedns-deploy.yml, type: deployment }
     - { name: kube-dns, file: kubedns-svc.yml, type: svc }
-    - { name: kubedns-autoscaler, file: kubedns-autoscaler-sa.yml, type: sa }
-    - { name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrole.yml, type: clusterrole }
-    - { name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
-    - { name: kubedns-autoscaler, file: kubedns-autoscaler.yml, type: deployment }
+    - { name: dns-autoscaler, file: dns-autoscaler-sa.yml, type: sa }
+    - { name: dns-autoscaler, file: dns-autoscaler-clusterrole.yml, type: clusterrole }
+    - { name: dns-autoscaler, file: dns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
+    - { name: dns-autoscaler, file: dns-autoscaler.yml, type: deployment }
   register: kubedns_manifests
   when:
     - dns_mode in ['kubedns','dnsmasq_kubedns']
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
index 9801305834d55da9ee85f31498042577d7a497ad..8e98ecaf7b5e5916c4253e14473c5ffdb602403a 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@@ -8,7 +8,6 @@ metadata:
     k8s-app: coredns{{ coredns_ordinal_suffix | default('') }}
     kubernetes.io/name: "coredns{{ coredns_ordinal_suffix | default('') }}"
 spec:
-  replicas: {{ coredns_replicas }}
   strategy:
     type: RollingUpdate
     rollingUpdate:
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler-clusterrole.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2
rename to roles/kubernetes-apps/ansible/templates/dns-autoscaler-clusterrole.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrolebinding.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler-clusterrolebinding.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrolebinding.yml.j2
rename to roles/kubernetes-apps/ansible/templates/dns-autoscaler-clusterrolebinding.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-sa.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler-sa.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-sa.yml.j2
rename to roles/kubernetes-apps/ansible/templates/dns-autoscaler-sa.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
similarity index 78%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml.j2
rename to roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
index bf1d468a8362d53f1a19250776f22a8af5efe686..d894eebf23babe3aa9ad0d1e6c95b11ed9eb1fd7 100644
--- a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -16,17 +16,17 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: kubedns-autoscaler
+  name: dns-autoscaler
   namespace: kube-system
   labels:
-    k8s-app: kubedns-autoscaler
+    k8s-app: dns-autoscaler
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   template:
     metadata:
       labels:
-        k8s-app: kubedns-autoscaler
+        k8s-app: dns-autoscaler
     spec:
 {% if kube_version is version('v1.11.1', '>=') %}
       priorityClassName: system-cluster-critical
@@ -43,7 +43,7 @@ spec:
           - topologyKey: "kubernetes.io/hostname"
             labelSelector:
               matchLabels:
-                k8s-app: kubedns-autoscaler
+                k8s-app: dns-autoscaler
         nodeAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
           - weight: 100
@@ -55,7 +55,7 @@ spec:
                 - "true"
       containers:
       - name: autoscaler
-        image: "{{ kubednsautoscaler_image_repo }}:{{ kubednsautoscaler_image_tag }}"
+        image: "{{ dnsautoscaler_image_repo }}:{{ dnsautoscaler_image_tag }}"
         resources:
           requests:
             cpu: "20m"
@@ -63,10 +63,14 @@ spec:
         command:
         - /cluster-proportional-autoscaler
         - --namespace=kube-system
-        - --configmap=kubedns-autoscaler
-        # Should keep target in sync with cluster/addons/dns/kubedns-controller.yaml.base
-        - --target=Deployment/kube-dns
-        - --default-params={"linear":{"nodesPerReplica":{{ kubedns_nodes_per_replica }},"min":{{ kubedns_min_replicas }}}}
+        - --default-params={"linear":{"nodesPerReplica":{{ dns_nodes_per_replica }},"min":{{ dns_min_replicas }}}}
         - --logtostderr=true
         - --v=2
+        - --configmap=dns-autoscaler
+{% if dns_mode in ['coredns', 'coredns_dual'] %}
+        - --target=Deployment/coredns{{ coredns_ordinal_suffix | default('') }}
+{% endif %}
+{% if dns_mode in ['kubedns', 'dnsmasq_kubedns'] %}
+        - --target=Deployment/kube-dns
+{% endif %}
       serviceAccountName: cluster-proportional-autoscaler
diff --git a/tests/files/do_ubuntu-canal-ha.yml b/tests/files/do_ubuntu-canal-ha.yml
index 05b5737d71cfaa433ac6c16712a331a5c43a5f60..ecd9ed428c75dd2ccd49e127e604de34c4d0b369 100644
--- a/tests/files/do_ubuntu-canal-ha.yml
+++ b/tests/files/do_ubuntu-canal-ha.yml
@@ -5,5 +5,5 @@ mode: ha
 # Deployment settings
 kube_network_plugin: canal
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 # cloud_provider: 'do'
diff --git a/tests/files/gce_centos-weave-kubeadm-sep.yml b/tests/files/gce_centos-weave-kubeadm-sep.yml
index c7efd28068dba9f5e2d565a35c9fed6e21027e97..9e2586438ee71f79eacc4f917ec56d025c3187e5 100644
--- a/tests/files/gce_centos-weave-kubeadm-sep.yml
+++ b/tests/files/gce_centos-weave-kubeadm-sep.yml
@@ -11,5 +11,5 @@ kube_network_plugin: weave
 kubeadm_enabled: true
 deploy_netchecker: true
 kubernetes_audit: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_centos7-calico-ha.yml b/tests/files/gce_centos7-calico-ha.yml
index 0bca5842e692dc6f994c940805fdc330fbe1c55a..8eec638ba7adf02f7c643910bbcbbcad5e4dca27 100644
--- a/tests/files/gce_centos7-calico-ha.yml
+++ b/tests/files/gce_centos7-calico-ha.yml
@@ -9,5 +9,5 @@ kube_network_plugin: calico
 download_localhost: true
 download_run_once: true
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_centos7-cilium.yml b/tests/files/gce_centos7-cilium.yml
index ec46a213d65abcfbd0636138e05b6acd041533a9..85e13a1c37cb6641dea8aac2774558684eb5e5aa 100644
--- a/tests/files/gce_centos7-cilium.yml
+++ b/tests/files/gce_centos7-cilium.yml
@@ -8,5 +8,5 @@ mode: default
 kube_network_plugin: cilium
 deploy_netchecker: true
 enable_network_policy: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_centos7-flannel-addons.yml b/tests/files/gce_centos7-flannel-addons.yml
index 86a3199c87bfc975eb356f9f93cdc89473ec7db6..0a8712a91817f5f7e9fc816cb9c942e6a05a1d60 100644
--- a/tests/files/gce_centos7-flannel-addons.yml
+++ b/tests/files/gce_centos7-flannel-addons.yml
@@ -12,7 +12,7 @@ etcd_events_cluster_setup: true
 local_volume_provisioner_enabled: true
 etcd_deployment_type: host
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
 kube_encrypt_secret_data: true
 ingress_nginx_enabled: true
diff --git a/tests/files/gce_centos7-kube-router.yml b/tests/files/gce_centos7-kube-router.yml
index c210d853f53765da285ffeaa3656b5602791a1a8..b433375a5c59921db5dab2708576397b4211f130 100644
--- a/tests/files/gce_centos7-kube-router.yml
+++ b/tests/files/gce_centos7-kube-router.yml
@@ -8,5 +8,5 @@ mode: default
 kube_network_plugin: kube-router
 deploy_netchecker: true
 enable_network_policy: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_centos7-multus-calico.yml b/tests/files/gce_centos7-multus-calico.yml
index 57615e285ea5db7f94bd5db63db6c419c55a0878..798339a006afa6a29319286d89f81cf4a71c37ea 100644
--- a/tests/files/gce_centos7-multus-calico.yml
+++ b/tests/files/gce_centos7-multus-calico.yml
@@ -8,5 +8,5 @@ mode: default
 kube_network_plugin_multus: true
 kube_network_plugin: calico
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_coreos-alpha-weave-ha.yml b/tests/files/gce_coreos-alpha-weave-ha.yml
index 6754a515596566d647eabddb144d5d508e3c298f..7de3b43ec4414fae855ee04352dbdfdaad1e5e75 100644
--- a/tests/files/gce_coreos-alpha-weave-ha.yml
+++ b/tests/files/gce_coreos-alpha-weave-ha.yml
@@ -9,5 +9,5 @@ startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd'
 kube_network_plugin: weave
 resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_coreos-calico-aio.yml b/tests/files/gce_coreos-calico-aio.yml
index ca33bd98242a47bb80e01988d73f1bee02454481..7430f562009ec27eb1c07bfecd93c7c4d74436e9 100644
--- a/tests/files/gce_coreos-calico-aio.yml
+++ b/tests/files/gce_coreos-calico-aio.yml
@@ -11,5 +11,5 @@ no_group_vars: true
 kube_network_plugin: calico
 resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_coreos-canal.yml b/tests/files/gce_coreos-canal.yml
index ca4cdd98d5c6648561036f0163350094cb6d66a6..ffeddc29c1b19320176896b26a043f4dd3c542dd 100644
--- a/tests/files/gce_coreos-canal.yml
+++ b/tests/files/gce_coreos-canal.yml
@@ -8,5 +8,5 @@ startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd'
 kube_network_plugin: canal
 resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_coreos-cilium.yml b/tests/files/gce_coreos-cilium.yml
index eb2b002c52a4f75b6511e6865242aa3a25f2ff01..6cf7358a1e95e19428f3fd89c3f22c0aaecf939e 100644
--- a/tests/files/gce_coreos-cilium.yml
+++ b/tests/files/gce_coreos-cilium.yml
@@ -9,5 +9,5 @@ kube_network_plugin: cilium
 resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
 deploy_netchecker: true
 enable_network_policy: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_coreos-kube-router.yml b/tests/files/gce_coreos-kube-router.yml
index 655ca2dd58122b6c8ceab64d290ff5fe4a6417b4..b13e1da4d6be5f67b681cb0b998041c9371a030d 100644
--- a/tests/files/gce_coreos-kube-router.yml
+++ b/tests/files/gce_coreos-kube-router.yml
@@ -9,5 +9,5 @@ kube_network_plugin: kube-router
 bootstrap_os: coreos
 resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_debian8-calico-upgrade.yml b/tests/files/gce_debian8-calico-upgrade.yml
index 54c5979250d9cee543753a5eee45f5485d90d9b8..1230bfffd54d26c9e2e202931d14c08cbd33ef23 100644
--- a/tests/files/gce_debian8-calico-upgrade.yml
+++ b/tests/files/gce_debian8-calico-upgrade.yml
@@ -6,5 +6,5 @@ mode: default
 # Deployment settings
 kube_network_plugin: calico
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_opensuse-canal.yml b/tests/files/gce_opensuse-canal.yml
index eb30255edcf8be011d5ba1464d4011a4ffb67fe8..26b6415f5916dcb8a8c4f58b2fa121461d4eed02 100644
--- a/tests/files/gce_opensuse-canal.yml
+++ b/tests/files/gce_opensuse-canal.yml
@@ -6,5 +6,5 @@ mode: default
 # Deployment settings
 kube_network_plugin: canal
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_rhel7-canal-sep.yml b/tests/files/gce_rhel7-canal-sep.yml
index e3c679629a3646a812eeff069e3493f340118057..57e89189631d7622389743d642edefeb02a2b28b 100644
--- a/tests/files/gce_rhel7-canal-sep.yml
+++ b/tests/files/gce_rhel7-canal-sep.yml
@@ -6,5 +6,5 @@ mode: separate
 # Deployment settings
 kube_network_plugin: canal
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_rhel7-cilium.yml b/tests/files/gce_rhel7-cilium.yml
index 0994d0099968e866d51b514e3c5c3e1bff5ce709..96be18debbaa755caac1a93e21d33bcc3d9aa234 100644
--- a/tests/files/gce_rhel7-cilium.yml
+++ b/tests/files/gce_rhel7-cilium.yml
@@ -7,5 +7,5 @@ mode: default
 kube_network_plugin: cilium
 deploy_netchecker: true
 enable_network_policy: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_rhel7-weave.yml b/tests/files/gce_rhel7-weave.yml
index bfff490daae32e04d99a054cfe1144c3bdbb7d98..ad5d61c4f9fb7e1f94dcf9c1d618a2091a2234bf 100644
--- a/tests/files/gce_rhel7-weave.yml
+++ b/tests/files/gce_rhel7-weave.yml
@@ -6,5 +6,5 @@ mode: default
 # Deployment settings
 kube_network_plugin: weave
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-canal-ha.yml b/tests/files/gce_ubuntu-canal-ha.yml
index 351d646222a7a8b205aca1ca165421d04c66719c..63f4179fb5192b2b85cb99a0b4c228fede7d57a1 100644
--- a/tests/files/gce_ubuntu-canal-ha.yml
+++ b/tests/files/gce_ubuntu-canal-ha.yml
@@ -6,5 +6,5 @@ mode: ha
 # Deployment settings
 kube_network_plugin: canal
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-canal-kubeadm.yml b/tests/files/gce_ubuntu-canal-kubeadm.yml
index afe46938bd37e190cf410a46589f9a60d585fe7e..1591415584426da5163d0c844ed868e6715c2444 100644
--- a/tests/files/gce_ubuntu-canal-kubeadm.yml
+++ b/tests/files/gce_ubuntu-canal-kubeadm.yml
@@ -9,5 +9,5 @@ kube_network_plugin: canal
 kubeadm_enabled: true
 dynamic_kubelet_configuration: true
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-cilium-sep.yml b/tests/files/gce_ubuntu-cilium-sep.yml
index 0c0647743922dee61e1914754fb618068edc942f..9892cf19f3b592224d5a5e5fcab9647a996f1184 100644
--- a/tests/files/gce_ubuntu-cilium-sep.yml
+++ b/tests/files/gce_ubuntu-cilium-sep.yml
@@ -7,6 +7,6 @@ mode: separate
 kube_network_plugin: cilium
 deploy_netchecker: true
 enable_network_policy: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
 
diff --git a/tests/files/gce_ubuntu-contiv-sep.yml b/tests/files/gce_ubuntu-contiv-sep.yml
index 0b3b575ab3a9fe6762dc50b99261c9faf224d9f7..a2d88c18e8336d96d1fb62922e0fcba76c7e4b97 100644
--- a/tests/files/gce_ubuntu-contiv-sep.yml
+++ b/tests/files/gce_ubuntu-contiv-sep.yml
@@ -6,5 +6,5 @@ mode: separate
 # Deployment settings
 kube_network_plugin: contiv
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-flannel-sep.yml b/tests/files/gce_ubuntu-flannel-sep.yml
index 6a5568e1d88837c9ab2f5bbc97c74d50a52cc0a6..e341378522246de62d0c7d7dacdfbe5f216ef9d6 100644
--- a/tests/files/gce_ubuntu-flannel-sep.yml
+++ b/tests/files/gce_ubuntu-flannel-sep.yml
@@ -6,5 +6,5 @@ mode: separate
 # Deployment settings
 kube_network_plugin: flannel
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-kube-router-sep.yml b/tests/files/gce_ubuntu-kube-router-sep.yml
index fde781ff2c6d809845e15379a4714e1711bac7b1..c5d29e32360db3bd7dc527eaef947239bc4c03f3 100644
--- a/tests/files/gce_ubuntu-kube-router-sep.yml
+++ b/tests/files/gce_ubuntu-kube-router-sep.yml
@@ -7,5 +7,5 @@ mode: separate
 bootstrap_os: ubuntu
 kube_network_plugin: kube-router
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-rkt-sep.yml b/tests/files/gce_ubuntu-rkt-sep.yml
index 718a23ba1d79edbcfdf54e2b59750a9def528dd0..c46807a47b3a0c8159f298ce300825ab0bd6a4a9 100644
--- a/tests/files/gce_ubuntu-rkt-sep.yml
+++ b/tests/files/gce_ubuntu-rkt-sep.yml
@@ -10,5 +10,5 @@ kubelet_deployment: rkt
 download_localhost: true
 download_run_once: true
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-weave-sep.yml b/tests/files/gce_ubuntu-weave-sep.yml
index a805b24bfb319445e14f1d2190858f510f081c22..52d6c241646d9ceb72f1ab0e44cbaa34ec52fb46 100644
--- a/tests/files/gce_ubuntu-weave-sep.yml
+++ b/tests/files/gce_ubuntu-weave-sep.yml
@@ -6,5 +6,5 @@ mode: separate
 # Deployment settings
 kube_network_plugin: weave
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu18-flannel-aio.yml b/tests/files/gce_ubuntu18-flannel-aio.yml
index 3ef7aa83c511fb06f7fd2531d3a25ed36288fccc..cd3a95534e4136bfc33186b01f48141c4855af18 100644
--- a/tests/files/gce_ubuntu18-flannel-aio.yml
+++ b/tests/files/gce_ubuntu18-flannel-aio.yml
@@ -8,5 +8,5 @@ mode: aio
 kube_network_plugin: flannel
 dynamic_kubelet_configuration: true
 deploy_netchecker: true
-kubedns_min_replicas: 1
+dns_min_replicas: 1
 cloud_provider: gce