diff --git a/cmd/kube-apiserver/OWNERS b/cmd/kube-apiserver/OWNERS
index 2129c7c8fee..062e77cc111 100644
--- a/cmd/kube-apiserver/OWNERS
+++ b/cmd/kube-apiserver/OWNERS
@@ -21,11 +21,11 @@ reviewers:
   - logicalhan
   - yue9944882
   - jpbetz
-  # - emeritus
-  # - ncdc
 labels:
   - sig/api-machinery
   - area/apiserver
 emeritus_approvers:
   - nikhiljindal
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/pkg/api/v1/OWNERS b/pkg/api/v1/OWNERS
index 8ea88cf7c54..274fc5464d9 100644
--- a/pkg/api/v1/OWNERS
+++ b/pkg/api/v1/OWNERS
@@ -20,5 +20,5 @@ reviewers:
   - jsafrane
   - dims
   - jayunit100
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/pkg/apis/autoscaling/OWNERS b/pkg/apis/autoscaling/OWNERS
index fb4c18c443a..9978d2cebb6 100644
--- a/pkg/apis/autoscaling/OWNERS
+++ b/pkg/apis/autoscaling/OWNERS
@@ -8,5 +8,5 @@ reviewers:
   - caesarxuchao
   - sttts
   - dims
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/pkg/apis/core/v1/OWNERS b/pkg/apis/core/v1/OWNERS
index 8ea88cf7c54..274fc5464d9 100644
--- a/pkg/apis/core/v1/OWNERS
+++ b/pkg/apis/core/v1/OWNERS
@@ -20,5 +20,5 @@ reviewers:
   - jsafrane
   - dims
   - jayunit100
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/pkg/apis/extensions/OWNERS b/pkg/apis/extensions/OWNERS
index 47b8ffed1b5..2db41e5347f 100644
--- a/pkg/apis/extensions/OWNERS
+++ b/pkg/apis/extensions/OWNERS
@@ -18,7 +18,7 @@ reviewers:
   - soltysh
   - dims
   - jpbetz
-  # - emeritus
-  # - ncdc
+emeritus_reviewers:
+  - ncdc
 labels:
   - sig/apps
diff --git a/pkg/client/OWNERS b/pkg/client/OWNERS
index 03ca2683320..29da6a23ba7 100644
--- a/pkg/client/OWNERS
+++ b/pkg/client/OWNERS
@@ -27,8 +27,8 @@ reviewers:
   - soltysh
   - jsafrane
   - jpbetz
-  # - emeritus
-  # - ncdc
 emeritus_approvers:
   - krousey
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/pkg/controlplane/OWNERS b/pkg/controlplane/OWNERS
index 790fd2bba26..c3ace1a4577 100644
--- a/pkg/controlplane/OWNERS
+++ b/pkg/controlplane/OWNERS
@@ -28,10 +28,10 @@ reviewers:
   - soltysh
   - enj
   - jpbetz
-  # - emeritus
-  # - ncdc
 labels:
   - sig/api-machinery
 emeritus_approvers:
   - nikhiljindal
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/pkg/registry/OWNERS b/pkg/registry/OWNERS
index c963d037825..d030a6731bc 100644
--- a/pkg/registry/OWNERS
+++ b/pkg/registry/OWNERS
@@ -25,7 +25,7 @@ reviewers:
   - dims
   - enj
   - jpbetz
-  # - emeritus
-  # - ncdc
 emeritus_approvers:
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/api/autoscaling/OWNERS b/staging/src/k8s.io/api/autoscaling/OWNERS
index fb4c18c443a..9978d2cebb6 100644
--- a/staging/src/k8s.io/api/autoscaling/OWNERS
+++ b/staging/src/k8s.io/api/autoscaling/OWNERS
@@ -8,5 +8,5 @@ reviewers:
   - caesarxuchao
   - sttts
   - dims
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/api/extensions/OWNERS b/staging/src/k8s.io/api/extensions/OWNERS
index abebbfce2c0..27b87bc52a9 100644
--- a/staging/src/k8s.io/api/extensions/OWNERS
+++ b/staging/src/k8s.io/api/extensions/OWNERS
@@ -17,5 +17,5 @@ reviewers:
   - mwielgus
   - soltysh
   - dims
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apimachinery/OWNERS b/staging/src/k8s.io/apimachinery/OWNERS
index 7486a0356ed..2dc066cd799 100644
--- a/staging/src/k8s.io/apimachinery/OWNERS
+++ b/staging/src/k8s.io/apimachinery/OWNERS
@@ -21,9 +21,9 @@ reviewers:
   - sttts
   - logicalhan
   - jpbetz
-  # - emeritus
-  # - ncdc
 labels:
   - sig/api-machinery
 emeritus_approvers:
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS b/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS
index 01ece747cc6..3bd8bf535e6 100644
--- a/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS
+++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS
@@ -11,5 +11,5 @@ reviewers:
   - liggitt
   - janetkuo
   - dims
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
index 4d53b744427..ec414a84b91 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
@@ -13,5 +13,5 @@ reviewers:
   - justinsb
   - soltysh
   - dims
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apiserver/OWNERS b/staging/src/k8s.io/apiserver/OWNERS
index 412588542f1..1b5c67e343d 100644
--- a/staging/src/k8s.io/apiserver/OWNERS
+++ b/staging/src/k8s.io/apiserver/OWNERS
@@ -18,10 +18,10 @@ reviewers:
   - apelisse
   - jpbetz
   - tkashem
-  # - emeritus
-  # - ncdc
 labels:
   - sig/api-machinery
   - area/apiserver
 emeritus_approvers:
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS b/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS
index cd4ada8a562..bfd15f78144 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS
+++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS
@@ -15,5 +15,5 @@ reviewers:
   - pwittrock
   - dims
   - enj
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS b/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS
index 29df081640d..e7207ecee81 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS
+++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS
@@ -13,5 +13,5 @@ reviewers:
   - dims
   - ingvagabund
   - enj
-# - emeritus
-# - ncdc
+emeritus_reviewers:
+  - ncdc
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/OWNERS
index 0147c44b3ed..b68cef1fe53 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/OWNERS
+++ b/staging/src/k8s.io/apiserver/pkg/storage/OWNERS
@@ -14,9 +14,9 @@ reviewers:
   - enj
   - stevekuznetsov
   - MadhavJivrajani
-  # - emeritus
-  # - ncdc
 emeritus_approvers:
   - xiang90
   - timothysc
   - lavalamp
+emeritus_reviewers:
+  - ncdc
diff --git a/test/e2e/apimachinery/OWNERS b/test/e2e/apimachinery/OWNERS
index f4e321b0f8e..69ca328d498 100644
--- a/test/e2e/apimachinery/OWNERS
+++ b/test/e2e/apimachinery/OWNERS
@@ -20,9 +20,9 @@ reviewers:
   - sttts
   - logicalhan
   - jpbetz
-  # - emeritus
-  # - ncdc
 labels:
   - sig/api-machinery
 emeritus_approvers:
   - lavalamp
+emeritus_reviewers:
+  - ncdc