diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go
index 704d50a9fd8..97a4050d366 100644
--- a/cmd/kube-apiserver/app/aggregator.go
+++ b/cmd/kube-apiserver/app/aggregator.go
@@ -264,6 +264,10 @@ var apiVersionPriorities = merge(controlplaneapiserver.DefaultGenericAPIServiceP
 	{Group: "", Version: "v1"}: {Group: 18000, Version: 1},
 	// to my knowledge, nothing below here collides
 	{Group: "apps", Version: "v1"}:                    {Group: 17800, Version: 15},
+	{Group: "autoscaling", Version: "v1"}:             {Group: 17500, Version: 15},
+	{Group: "autoscaling", Version: "v2"}:             {Group: 17500, Version: 30},
+	{Group: "autoscaling", Version: "v2beta1"}:        {Group: 17500, Version: 9},
+	{Group: "autoscaling", Version: "v2beta2"}:        {Group: 17500, Version: 1},
 	{Group: "batch", Version: "v1"}:                   {Group: 17400, Version: 15},
 	{Group: "batch", Version: "v1beta1"}:              {Group: 17400, Version: 9},
 	{Group: "batch", Version: "v2alpha1"}:             {Group: 17400, Version: 9},
diff --git a/pkg/controlplane/apiserver/aggregator.go b/pkg/controlplane/apiserver/aggregator.go
index 8a3e955eb75..2100cbd4adb 100644
--- a/pkg/controlplane/apiserver/aggregator.go
+++ b/pkg/controlplane/apiserver/aggregator.go
@@ -44,10 +44,6 @@ func DefaultGenericAPIServicePriorities() map[schema.GroupVersion]APIServicePrio
 		{Group: "authentication.k8s.io", Version: "v1beta1"}:         {Group: 17700, Version: 9},
 		{Group: "authentication.k8s.io", Version: "v1alpha1"}:        {Group: 17700, Version: 1},
 		{Group: "authorization.k8s.io", Version: "v1"}:               {Group: 17600, Version: 15},
-		{Group: "autoscaling", Version: "v1"}:                        {Group: 17500, Version: 15},
-		{Group: "autoscaling", Version: "v2"}:                        {Group: 17500, Version: 30},
-		{Group: "autoscaling", Version: "v2beta1"}:                   {Group: 17500, Version: 9},
-		{Group: "autoscaling", Version: "v2beta2"}:                   {Group: 17500, Version: 1},
 		{Group: "certificates.k8s.io", Version: "v1"}:                {Group: 17300, Version: 15},
 		{Group: "certificates.k8s.io", Version: "v1alpha1"}:          {Group: 17300, Version: 1},
 		{Group: "rbac.authorization.k8s.io", Version: "v1"}:          {Group: 17000, Version: 15},