From 2211e5853ae631190302847a7005123d51a8ece4 Mon Sep 17 00:00:00 2001
From: "Schlotter, Christian" <christian.schlotter@daimler.com>
Date: Wed, 9 Mar 2022 15:14:19 +0100
Subject: [PATCH] sync OWNERS from main to release branch

Signed-off-by: Schlotter, Christian <christian.schlotter@daimler.com>
---
 OWNERS         |  8 +++-----
 OWNERS_ALIASES | 15 +++++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/OWNERS b/OWNERS
index 889101b313..107615064d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -10,7 +10,7 @@ reviewers:
   - cluster-api-openstack-maintainers
   - cluster-api-openstack-reviewers
 
-emeritus_maintainers:
+emeritus_approvers:
   - ncdc
   - chaosaffe
   - chrigl
@@ -18,7 +18,5 @@ emeritus_maintainers:
   - gyliu513
   - Lion-Wei
   - m1093782566
-
-emeritus_reviewers:
-  - iamemilio
-  - YorikSar
+  - sbueringer
+  - hidekazuna
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index c45397a933..f8c9d975f7 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -1,4 +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
@@ -19,10 +25,11 @@ aliases:
     - vincepri
     - CecileRobertMichon
   cluster-api-openstack-maintainers:
+    - chrischdi
     - jichenjc
-    - sbueringer
-    - hidekazuna
+    - mdbooth
+    - seanschneeweiss
+    - tobiasgiese
   cluster-api-openstack-reviewers:
-    - chrischdi
+    - macaptain
     - prankul88
-    - seanschneeweiss