diff --git a/OWNERS b/OWNERS
index 107615064d..fb73b142f0 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,22 +1,6 @@
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
 approvers:
-  - sig-cluster-lifecycle-leads
-  - cluster-api-admins
-  - cluster-api-maintainers
-  - cluster-api-openstack-maintainers
-
+  - shiftstack-team
 reviewers:
-  - cluster-api-openstack-maintainers
-  - cluster-api-openstack-reviewers
-
-emeritus_approvers:
-  - ncdc
-  - chaosaffe
-  - chrigl
-  - dims
-  - gyliu513
-  - Lion-Wei
-  - m1093782566
-  - sbueringer
-  - hidekazuna
+  - shiftstack-team
+component: "Cloud Compute"
+subcomponent: "OpenStack Provider"
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index f8c9d975f7..c695d6c0c6 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -1,35 +1,10 @@
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-#
-# When making changes to this file, also consider if you need to update:
-# - https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml
-# - https://github.com/kubernetes/test-infra/blob/master/OWNERS_ALIASES
-# - https://github.com/kubernetes/k8s.io/blob/main/groups/sig-architecture/groups.yaml
-# - https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml
-
 aliases:
-  # correct as of 2021/03/03
-  sig-cluster-lifecycle-leads:
-    - justinsb
-    - neolit123
-    - timothysc
-    - fabriziopandini
-  # correct as of 2021/03/03
-  cluster-api-admins:
-    - justinsb
-    - detiber
-    - vincepri
-  # correct as of 2021/03/03
-  cluster-api-maintainers:
-    - justinsb
-    - detiber
-    - vincepri
-    - CecileRobertMichon
-  cluster-api-openstack-maintainers:
-    - chrischdi
-    - jichenjc
+  shiftstack-team:
+    - EmilienM
+    - MaysaMacedo
+    - dulek
+    - gryf
+    - mandre
     - mdbooth
-    - seanschneeweiss
-    - tobiasgiese
-  cluster-api-openstack-reviewers:
-    - macaptain
-    - prankul88
+    - pierreprinetti
+    - stephenfin