diff --git a/SECURITY_CONTACTS b/SECURITY_CONTACTS
index f52209a39de5..55a88228e340 100644
--- a/SECURITY_CONTACTS
+++ b/SECURITY_CONTACTS
@@ -11,6 +11,5 @@
 # INSTRUCTIONS AT https://kubernetes.io/security/
 
 stevekuznetsov
-fejta
 cjwagner
-alvaroaleman
\ No newline at end of file
+alvaroaleman
diff --git a/config/jobs/bazelbuild/rules_k8s/OWNERS b/config/jobs/bazelbuild/rules_k8s/OWNERS
index 6b45fb2b371e..460ea83de176 100644
--- a/config/jobs/bazelbuild/rules_k8s/OWNERS
+++ b/config/jobs/bazelbuild/rules_k8s/OWNERS
@@ -1,6 +1,4 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-- fejta
-approvers:
+emeritus_approvers:
 - fejta
diff --git a/config/jobs/kubernetes/org/OWNERS b/config/jobs/kubernetes/org/OWNERS
index 7902dee65ac1..2ef10c57e58b 100644
--- a/config/jobs/kubernetes/org/OWNERS
+++ b/config/jobs/kubernetes/org/OWNERS
@@ -2,17 +2,17 @@
 
 reviewers:
 - cblecker
-- fejta
 - idvoretskyi
 - mrbobbytables
 - nikhita
 - spiffxp
 approvers:
 - cblecker
-- fejta
 - idvoretskyi
 - mrbobbytables
 - nikhita
 - spiffxp
+emeritus_approvers:
+- fejta
 labels:
 - sig/contributor-experience
diff --git a/gencred/OWNERS b/gencred/OWNERS
index e3739cdf5af4..b52123e463ed 100644
--- a/gencred/OWNERS
+++ b/gencred/OWNERS
@@ -1,8 +1,5 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-- clarketm
-- fejta
-approvers:
+emeritus_approvers:
 - clarketm
 - fejta
diff --git a/images/pull-test-infra-gubernator/OWNERS b/images/pull-test-infra-gubernator/OWNERS
index 635320acdeaf..d00967d85262 100644
--- a/images/pull-test-infra-gubernator/OWNERS
+++ b/images/pull-test-infra-gubernator/OWNERS
@@ -5,10 +5,10 @@ reviewers:
 - spiffxp
 - stevekuznetsov
 approvers:
-- fejta
 - spiffxp
 - stevekuznetsov
 emeritus_approvers:
+- fejta
 - ibzib
 - Katharine
 - rmmh
diff --git a/jenkins/OWNERS b/jenkins/OWNERS
index 8a27cd710b49..8f207139dde9 100644
--- a/jenkins/OWNERS
+++ b/jenkins/OWNERS
@@ -2,12 +2,11 @@
 
 reviewers:
 - cjwagner
-- fejta
 approvers:
 - cjwagner
-- fejta
 emeritus_approvers:
 - krzyzacy
+- fejta
 
 labels:
 - area/jenkins
diff --git a/kettle/buckets.yaml b/kettle/buckets.yaml
index 5abd91dfc93c..6314aae4a68c 100644
--- a/kettle/buckets.yaml
+++ b/kettle/buckets.yaml
@@ -9,7 +9,7 @@
 #   exclude_jobs: A list of job names that will not be uploaded to BQ
 
 gs://kubernetes-jenkins/logs/:
-  contact: "fejta"
+  contact: "spiffxp"
   prefix: ""
   sequential: false
   exclude_jobs:
diff --git a/kettle/stream_test.py b/kettle/stream_test.py
index f477a7931d06..214da1a8852d 100755
--- a/kettle/stream_test.py
+++ b/kettle/stream_test.py
@@ -117,7 +117,7 @@ def test_should_exclude(self, _, object_id, bucket_id, buckets, expected):
 class StreamTest(unittest.TestCase):
 
     fake_buckets = {'kubernetes-jenkins':
-                        {'contact': 'fejta',
+                        {'contact': 'spiffxp',
                          'prefix': '',
                          'sequential': False,
                          'exclude_jobs': ['ci-test-infra-benchmark-demo',
diff --git a/label_sync/OWNERS b/label_sync/OWNERS
index fdec5bdc1ef2..87b340b8470b 100644
--- a/label_sync/OWNERS
+++ b/label_sync/OWNERS
@@ -5,10 +5,10 @@ filters:
     approvers:
       - cblecker
       - spiffxp
-      - fejta
     reviewers:
       - cblecker
       - spiffxp
+    emeritus_approvers:
       - fejta
     labels:
       - area/label_sync
diff --git a/pkg/benchmarkjunit/OWNERS b/pkg/benchmarkjunit/OWNERS
index daa02cd56785..eaf34f1b0e49 100644
--- a/pkg/benchmarkjunit/OWNERS
+++ b/pkg/benchmarkjunit/OWNERS
@@ -2,7 +2,7 @@
 
 reviewers:
 - cjwagner
-- fejta
 approvers:
 - cjwagner
+emeritus_approvers:
 - fejta
diff --git a/prow/OWNERS b/prow/OWNERS
index a9cbccc498d7..cb12df2eb70c 100644
--- a/prow/OWNERS
+++ b/prow/OWNERS
@@ -1,22 +1,20 @@
 # See the OWNERS docs at https://go.k8s.io/owners
-
-approvers:
+reviewers:
   - alvaroaleman
   - cblecker
   - cjwagner
-  - fejta
+  - matthyx
+  - michelle192837
   - petr-muller
   - stevekuznetsov
-emeritus_approvers:
-  - spxtr # 2018-09-17
-reviewers:
+approvers:
   - alvaroaleman
   - cblecker
   - cjwagner
-  - fejta
-  - matthyx
-  - michelle192837
   - petr-muller
   - stevekuznetsov
+emeritus_approvers:
+  - spxtr # 2018-09-17
+  - fejta
 labels:
   - area/prow
diff --git a/prow/cmd/crier/OWNERS b/prow/cmd/crier/OWNERS
index eedb83096bb0..d20e293de088 100644
--- a/prow/cmd/crier/OWNERS
+++ b/prow/cmd/crier/OWNERS
@@ -2,11 +2,10 @@
 reviewers:
 - chaodaiG
 - cjwagner
-- fejta
 approvers:
 - cjwagner
-- fejta
 emeritus_approvers:
+- fejta
 - krzyzacy
 labels:
 - area/prow/crier
diff --git a/prow/cmd/gerrit/OWNERS b/prow/cmd/gerrit/OWNERS
index 9ab8c746c49e..717a5ab8488e 100644
--- a/prow/cmd/gerrit/OWNERS
+++ b/prow/cmd/gerrit/OWNERS
@@ -2,12 +2,11 @@
 
 reviewers:
 - chaodaiG
-- fejta
 approvers:
 - chaodaiG
-- fejta
 emeritus_approvers:
 - amwat
+- fejta
 - krzyzacy
 labels:
 - area/prow/gerrit
diff --git a/prow/cmd/horologium/OWNERS b/prow/cmd/horologium/OWNERS
index 31a674b92308..bceb28433805 100644
--- a/prow/cmd/horologium/OWNERS
+++ b/prow/cmd/horologium/OWNERS
@@ -1,8 +1,7 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 reviewers:
 - chaodaiG
-- fejta
-approvers:
+emeritus_approvers:
 - fejta
 labels:
 - area/prow/horologium
diff --git a/prow/crier/OWNERS b/prow/crier/OWNERS
index 8d0fd36df8b4..4e4070bbd304 100644
--- a/prow/crier/OWNERS
+++ b/prow/crier/OWNERS
@@ -2,11 +2,10 @@
 reviewers:
 - chaodaiG
 - cjwagner
-- fejta
 approvers:
 - cjwagner
-- fejta
 emeritus_approvers:
+- fejta
 - krzyzacy
 - Katharine
 labels:
diff --git a/prow/gerrit/OWNERS b/prow/gerrit/OWNERS
index 9ad970873644..dfa2d31c6b2c 100644
--- a/prow/gerrit/OWNERS
+++ b/prow/gerrit/OWNERS
@@ -2,10 +2,8 @@
 
 reviewers:
 - chaodaiG
-- fejta
-approvers:
-- fejta
 emeritus_approvers:
+- fejta
 - Katharine
 labels:
 - area/prow/gerrit
diff --git a/robots/OWNERS b/robots/OWNERS
index 8a120de5ea2c..b5f6012d0349 100644
--- a/robots/OWNERS
+++ b/robots/OWNERS
@@ -2,12 +2,12 @@
 
 reviewers:
 - cjwagner
-- fejta
 - stevekuznetsov
 approvers:
 - cjwagner
-- fejta
 - stevekuznetsov
+emeritus_approvers:
+- fejta
 
 labels:
 - area/robots