diff --git a/config/overlays/featuregate/synthetic-user-permissions/kustomization.yaml b/config/components/features/synthetic-user-permissions/kustomization.yaml
similarity index 63%
rename from config/overlays/featuregate/synthetic-user-permissions/kustomization.yaml
rename to config/components/features/synthetic-user-permissions/kustomization.yaml
index e5e8b33146..8db8f54493 100644
--- a/config/overlays/featuregate/synthetic-user-permissions/kustomization.yaml
+++ b/config/components/features/synthetic-user-permissions/kustomization.yaml
@@ -1,13 +1,7 @@
 # kustomization file for OLMv1 support for synthetic auth
 # DO NOT ADD A NAMESPACE HERE
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../../../base/operator-controller
-  - ../../../base/common
-components:
-  - ../../../components/tls/operator-controller
-
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 patches:
  - target:
       kind: Deployment
diff --git a/config/overlays/featuregate/synthetic-user-permissions/patches/enable-featuregate.yaml b/config/components/features/synthetic-user-permissions/patches/enable-featuregate.yaml
similarity index 100%
rename from config/overlays/featuregate/synthetic-user-permissions/patches/enable-featuregate.yaml
rename to config/components/features/synthetic-user-permissions/patches/enable-featuregate.yaml
diff --git a/config/overlays/featuregate/synthetic-user-permissions/patches/impersonate-perms.yaml b/config/components/features/synthetic-user-permissions/patches/impersonate-perms.yaml
similarity index 100%
rename from config/overlays/featuregate/synthetic-user-permissions/patches/impersonate-perms.yaml
rename to config/components/features/synthetic-user-permissions/patches/impersonate-perms.yaml
diff --git a/config/overlays/featuregate/webhook-provider-certmanager/kustomization.yaml b/config/components/features/webhook-provider-certmanager/kustomization.yaml
similarity index 57%
rename from config/overlays/featuregate/webhook-provider-certmanager/kustomization.yaml
rename to config/components/features/webhook-provider-certmanager/kustomization.yaml
index 3898bbc9e3..028d104c3a 100644
--- a/config/overlays/featuregate/webhook-provider-certmanager/kustomization.yaml
+++ b/config/components/features/webhook-provider-certmanager/kustomization.yaml
@@ -1,13 +1,7 @@
 # kustomization file for cert-manager backed OLMv1 support for installation of bundles with webhooks
 # DO NOT ADD A NAMESPACE HERE
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../../../base/operator-controller
-  - ../../../base/common
-components:
-  - ../../../components/tls/operator-controller
-
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 patches:
  - target:
       kind: Deployment
diff --git a/config/overlays/featuregate/webhook-provider-certmanager/patches/enable-featuregate.yaml b/config/components/features/webhook-provider-certmanager/patches/enable-featuregate.yaml
similarity index 100%
rename from config/overlays/featuregate/webhook-provider-certmanager/patches/enable-featuregate.yaml
rename to config/components/features/webhook-provider-certmanager/patches/enable-featuregate.yaml
diff --git a/config/overlays/featuregate/webhook-provider-openshift-serviceca/kustomization.yaml b/config/components/features/webhook-provider-openshift-serviceca/kustomization.yaml
similarity index 57%
rename from config/overlays/featuregate/webhook-provider-openshift-serviceca/kustomization.yaml
rename to config/components/features/webhook-provider-openshift-serviceca/kustomization.yaml
index de31bef57f..6b0fe2684b 100644
--- a/config/overlays/featuregate/webhook-provider-openshift-serviceca/kustomization.yaml
+++ b/config/components/features/webhook-provider-openshift-serviceca/kustomization.yaml
@@ -1,13 +1,7 @@
 # kustomization file for openshift-serviceca backed OLMv1 support for installation of bundles with webhooks
 # DO NOT ADD A NAMESPACE HERE
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../../../base/operator-controller
-  - ../../../base/common
-components:
-  - ../../../components/tls/operator-controller
-
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 patches:
  - target:
       kind: Deployment
diff --git a/config/overlays/featuregate/webhook-provider-openshift-serviceca/patches/enable-featuregate.yaml b/config/components/features/webhook-provider-openshift-serviceca/patches/enable-featuregate.yaml
similarity index 100%
rename from config/overlays/featuregate/webhook-provider-openshift-serviceca/patches/enable-featuregate.yaml
rename to config/components/features/webhook-provider-openshift-serviceca/patches/enable-featuregate.yaml