diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
index 6e5992de305..c0501543ec3 100644
--- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
@@ -84,7 +84,6 @@ spec:
           cluster-cidr: 10.244.0.0/16,2001:1234:5678:9a40::/58
           cluster-name: ${CLUSTER_NAME}
           configure-cloud-routes: "true"
-          feature-gates: HPAContainerMetrics=true
           v: "4"
       etcd:
         local:
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
index 66047b73c30..fae899f7719 100644
--- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
@@ -84,7 +84,6 @@ spec:
           cluster-cidr: 2001:1234:5678:9a40::/58
           cluster-name: ${CLUSTER_NAME}
           configure-cloud-routes: "true"
-          feature-gates: HPAContainerMetrics=true
           v: "4"
       etcd:
         local:
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
index 9b96145ee66..1bba88aeb3f 100644
--- a/templates/test/ci/cluster-template-prow-ci-version.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -68,7 +68,6 @@ spec:
           allocate-node-cidrs: "false"
           cloud-provider: external
           cluster-name: ${CLUSTER_NAME}
-          feature-gates: HPAContainerMetrics=true
           v: "4"
       etcd:
         local:
diff --git a/templates/test/ci/patches/controller-manager-featuregates.yaml b/templates/test/ci/patches/controller-manager-featuregates.yaml
deleted file mode 100644
index 4251645fa99..00000000000
--- a/templates/test/ci/patches/controller-manager-featuregates.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-kind: KubeadmControlPlane
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-metadata:
-  name: "${CLUSTER_NAME}-control-plane"
-spec:
-  kubeadmConfigSpec:
-    clusterConfiguration:
-      controllerManager:
-        extraArgs:
-          feature-gates: "HPAContainerMetrics=true"
diff --git a/templates/test/ci/prow-ci-version/kustomization.yaml b/templates/test/ci/prow-ci-version/kustomization.yaml
index abf9cc9dbf5..195dbc5d9ec 100644
--- a/templates/test/ci/prow-ci-version/kustomization.yaml
+++ b/templates/test/ci/prow-ci-version/kustomization.yaml
@@ -54,7 +54,6 @@ patches:
 - path: patches/machine-deployment-ci-version-windows.yaml
 - path: patches/machine-deployment-ci-version-control-plane.yaml
 - path: ../patches/metrics-server-enabled-cluster.yaml
-- path: ../patches/controller-manager-featuregates.yaml
 - path: ../patches/uami-md-0.yaml
 configMapGenerator:
 - behavior: merge
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
index b7242105443..fe5b76dd11f 100644
--- a/templates/test/dev/cluster-template-custom-builds.yaml
+++ b/templates/test/dev/cluster-template-custom-builds.yaml
@@ -70,7 +70,6 @@ spec:
           allocate-node-cidrs: "false"
           cloud-provider: external
           cluster-name: ${CLUSTER_NAME}
-          feature-gates: HPAContainerMetrics=true
           v: "4"
       etcd:
         local:
diff --git a/templates/test/dev/custom-builds/kustomization.yaml b/templates/test/dev/custom-builds/kustomization.yaml
index f9651b84640..56a412bd93a 100644
--- a/templates/test/dev/custom-builds/kustomization.yaml
+++ b/templates/test/dev/custom-builds/kustomization.yaml
@@ -51,7 +51,6 @@ patches:
 - path: ../../../test/ci/patches/windows-containerd-labels.yaml
 - path: ../../../test/ci/patches/windows-machine-deployment-replicas.yaml
 - path: ../../../test/ci/patches/metrics-server-enabled-cluster.yaml
-- path: ../../../test/ci/patches/controller-manager-featuregates.yaml
 configMapGenerator:
 - behavior: merge
   files: