diff --git a/templates/cluster-template-clusterclass.yaml b/templates/cluster-template-clusterclass.yaml
index b37275b3f..f4386b709 100644
--- a/templates/cluster-template-clusterclass.yaml
+++ b/templates/cluster-template-clusterclass.yaml
@@ -121,8 +121,6 @@ spec:
         clusterConfiguration:
           apiServer:
             timeoutForControlPlane: 20m
-            extraArgs:
-              cloud-provider: gce
           controllerManager:
             extraArgs:
               cloud-provider: gce
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
index da9f5e463..425491437 100644
--- a/templates/cluster-template.yaml
+++ b/templates/cluster-template.yaml
@@ -47,9 +47,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: gce
-          feature-gates: "DisableCloudProviders=false,DisableKubeletCloudCredentialProviders=false"
       controllerManager:
         extraArgs:
           cloud-provider: gce
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml
index 6aed3c5fa..a6cba8a94 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml
@@ -52,8 +52,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml
index 1a81b6b82..95048c8bc 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml
@@ -56,8 +56,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml
index 405007883..f18cecfd9 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml
@@ -49,8 +49,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml
index 1e2d03a92..9e5f5e33d 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml
@@ -48,8 +48,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml
index c5519db6c..71b4596da 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml
@@ -48,8 +48,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml
index 177006eee..9dc12daaa 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml
@@ -50,8 +50,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml
index bc904d3f5..abaf5dfe5 100644
--- a/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml
+++ b/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml
@@ -48,8 +48,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml
index 2d83631e3..89267a77b 100644
--- a/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml
+++ b/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml
@@ -120,8 +120,6 @@ spec:
         clusterConfiguration:
           apiServer:
             timeoutForControlPlane: 20m
-            extraArgs:
-              cloud-provider: external
           controllerManager:
             extraArgs:
               cloud-provider: external