diff --git a/cluster/addons/calico-policy-controller/calico-cpva-clusterrole.yaml b/cluster/addons/calico-policy-controller/calico-cpva-clusterrole.yaml
index 5f232bff689..78f0cc88165 100644
--- a/cluster/addons/calico-policy-controller/calico-cpva-clusterrole.yaml
+++ b/cluster/addons/calico-policy-controller/calico-cpva-clusterrole.yaml
@@ -8,6 +8,6 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["list"]
-  - apiGroups: ["apps", "extensions"]
+  - apiGroups: ["apps"]
     resources: ["deployments", "daemonsets"]
     verbs: ["patch"]
diff --git a/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-role.yaml b/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-role.yaml
index e5fb3aed00b..385f5179408 100644
--- a/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-role.yaml
+++ b/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-role.yaml
@@ -9,6 +9,6 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get"]
-  - apiGroups: ["apps", "extensions"]
+  - apiGroups: ["apps"]
     resources: ["deployments/scale"]
     verbs: ["get", "update"]
diff --git a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml
index c8c72c7d119..35af7416ace 100644
--- a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml
+++ b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml
@@ -8,6 +8,6 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["list"]
-  - apiGroups: ["apps", "extensions"]
+  - apiGroups: ["apps"]
     resources: ["deployments"]
     verbs: ["patch"]
diff --git a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
index 94a29606e03..3562d920dba 100644
--- a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
+++ b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
@@ -33,7 +33,7 @@ rules:
   - apiGroups: [""]
     resources: ["replicationcontrollers/scale"]
     verbs: ["get", "update"]
-  - apiGroups: ["extensions","apps"]
+  - apiGroups: ["apps"]
     resources: ["deployments/scale", "replicasets/scale"]
     verbs: ["get", "update"]
 # Remove the configmaps rule once below issue is fixed:
diff --git a/cluster/addons/fluentd-gcp/scaler-rbac.yaml b/cluster/addons/fluentd-gcp/scaler-rbac.yaml
index f9505f76dee..29280a28b80 100644
--- a/cluster/addons/fluentd-gcp/scaler-rbac.yaml
+++ b/cluster/addons/fluentd-gcp/scaler-rbac.yaml
@@ -17,7 +17,7 @@ metadata:
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
 - apiGroups:
-  - "extensions"
+  - "apps"
   resources:
   - daemonsets
   verbs:
diff --git a/cluster/addons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml b/cluster/addons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml
index b858f0fab37..68c91f771af 100644
--- a/cluster/addons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml
+++ b/cluster/addons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml
@@ -35,7 +35,7 @@ rules:
   - apiGroups: [""]
     resources: ["services", "replicationcontrollers", "persistentvolumes", "persistentvolumeclaims"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps", "extensions"]
+  - apiGroups: ["apps"]
     resources: ["daemonsets", "replicasets"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["apps"]