diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index d5a116aaec4..d3166c3fadb 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -215,10 +215,13 @@ aliases:
     - seans3
     - soltysh
   sig-testing-reviewers:
+    - aojea
     - bentheelder
     - cblecker
-    - spiffxp
     - dims
+    - pohly
+  # emeritus:
+  # - spiffxp
   sig-node-approvers:
     - Random-Liu
     - dchen1107
@@ -553,5 +556,6 @@ aliases:
   conformance-behavior-approvers:
     - smarterclayton
     - johnbelamaric
-    - spiffxp
     - dims
+  # emeritus:
+  # - spiffpx
diff --git a/build/OWNERS b/build/OWNERS
index 33d5150d38a..b52ce2f0ecc 100644
--- a/build/OWNERS
+++ b/build/OWNERS
@@ -14,7 +14,6 @@ reviewers:
   - palnabarun # Release Manager
   - puerco # SIG Technical Lead / RelEng subproject owner / Release Manager
   - saschagrunert # SIG Chair / RelEng subproject owner / Release Manager
-  - spiffxp
   - thockin
   - Verolop # Release Manager
   - xmudrii # Release Manager
@@ -25,10 +24,10 @@ approvers:
   - justaugustus
   - liggitt
   - mikedanese
-  - spiffxp
   - thockin
 emeritus_approvers:
   - fejta
   - jbeda
+  - spiffxp
   - zmerlynn
   - lavalamp
diff --git a/cmd/kube-controller-manager/OWNERS b/cmd/kube-controller-manager/OWNERS
index e10618b19dc..11416b81d12 100644
--- a/cmd/kube-controller-manager/OWNERS
+++ b/cmd/kube-controller-manager/OWNERS
@@ -29,7 +29,6 @@ reviewers:
   - sjenning
   - smarterclayton
   - soltysh
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
diff --git a/cmd/preferredimports/OWNERS b/cmd/preferredimports/OWNERS
index 1ee6480c5c9..768d003b926 100644
--- a/cmd/preferredimports/OWNERS
+++ b/cmd/preferredimports/OWNERS
@@ -2,7 +2,9 @@
 
 reviewers:
   - johnSchnake
+  - BenTheElder
 approvers:
   - dims
   - cblecker
+emeritus_aprovers:
   - spiffxp
diff --git a/hack/OWNERS b/hack/OWNERS
index 88aaa37fecc..8a1266f9829 100644
--- a/hack/OWNERS
+++ b/hack/OWNERS
@@ -13,7 +13,6 @@ reviewers:
   - pohly
   - SataQiu
   - smarterclayton
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
@@ -31,7 +30,6 @@ approvers:
   - SataQiu
   - smarterclayton
   - soltysh # for sig-cli related stuff
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
@@ -43,3 +41,4 @@ emeritus_approvers:
   - lavalamp
   - zmerlynn
   - vishh
+  - spiffxp
diff --git a/pkg/util/coverage/OWNERS b/pkg/util/coverage/OWNERS
index 87df89cdb57..74d51577c75 100644
--- a/pkg/util/coverage/OWNERS
+++ b/pkg/util/coverage/OWNERS
@@ -2,9 +2,9 @@
 
 approvers:
   - bentheelder
-  - spiffxp
 reviewers:
   - bentheelder
+emeritus_approvers:
   - spiffxp
 labels:
   - sig/testing
diff --git a/test/OWNERS b/test/OWNERS
index e5bda14c730..30a9f63c95e 100644
--- a/test/OWNERS
+++ b/test/OWNERS
@@ -35,7 +35,6 @@ approvers:
   - SataQiu
   - smarterclayton
   - soltysh
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
@@ -56,6 +55,7 @@ emeritus_approvers:
   - ncdc
   - vishh
   - shyamjvs
+  - spiffxp
   - enisoc
   - alejandrox1
   - timothysc
diff --git a/test/conformance/OWNERS b/test/conformance/OWNERS
index a410bf66e16..5d4ce8f5f19 100644
--- a/test/conformance/OWNERS
+++ b/test/conformance/OWNERS
@@ -2,14 +2,15 @@
 
 # This is the owner of the test code.  The test data itself is owned by sig-architecture.
 reviewers:
+  - bentheelder
   - cheftako
   - oomichi
   - johnbelamaric
 approvers:
   - cheftako
-  - spiffxp
   - johnbelamaric
 emeritus_approvers:
+  - spiffxp
 labels:
   - area/conformance
   - sig/architecture
diff --git a/test/conformance/image/OWNERS b/test/conformance/image/OWNERS
index 8fdc8ef2545..67afc3f43ea 100644
--- a/test/conformance/image/OWNERS
+++ b/test/conformance/image/OWNERS
@@ -2,17 +2,16 @@
 
 reviewers:
   - dims
-  - spiffxp
   - bentheelder
   - johnSchnake
 approvers:
   - dims
-  - spiffxp
   - bentheelder
 emeritus_approvers:
   - ixdy
   - timothysc
   - neolit123
+  - spiffxp
 labels:
   - sig/release
   - sig/testing
diff --git a/test/conformance/testdata/OWNERS b/test/conformance/testdata/OWNERS
index fdc485482d7..9e008af8062 100644
--- a/test/conformance/testdata/OWNERS
+++ b/test/conformance/testdata/OWNERS
@@ -4,8 +4,8 @@
 options:
   no_parent_owners: true
 reviewers:
+  - bentheelder
   - smarterclayton
-  - spiffxp
   - dims
   - johnbelamaric
 approvers:
diff --git a/test/e2e/architecture/OWNERS b/test/e2e/architecture/OWNERS
index 44aad16962a..dcb55df90e7 100644
--- a/test/e2e/architecture/OWNERS
+++ b/test/e2e/architecture/OWNERS
@@ -3,14 +3,15 @@
 # This is the owner of the test code.  The test data itself is owned by sig-architecture.
 reviewers:
   - aojea
+  - bentheelder
   - cheftako
   - oomichi
   - johnbelamaric
 approvers:
   - cheftako
-  - spiffxp
   - johnbelamaric
 emeritus_approvers:
+  - spiffxp
 labels:
   - area/conformance
   - sig/architecture