diff --git a/OWNERS b/OWNERS
index 3faeb2929acca..124c41b2203b4 100644
--- a/OWNERS
+++ b/OWNERS
@@ -17,7 +17,6 @@ per-file .vpython*=iannucci@chromium.org
 per-file .yapfignore=*
 per-file AUTHORS=*
 per-file BUILD.gn=file://build/OWNERS
-per-file codereview.settings=agable@chromium.org
 per-file CODE_OF_CONDUCT.md=dpranke@chromium.org
 per-file CODE_OF_CONDUCT.md=dpranke@google.com
 per-file CODE_OF_CONDUCT.md=groby@chromium.org
diff --git a/WATCHLISTS b/WATCHLISTS
index bbe3a5a605438..76f61713fc4ed 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -851,9 +851,6 @@
     'clipboard': {
       'filepath': 'clipboard|dnd|drag|drop',
     },
-    'codereview_settings': {
-      'filepath': 'codereview.settings',
-    },
     'components_deps': {
       'filepath': 'components/([^/]*/)*DEPS',
     },
@@ -2405,7 +2402,6 @@
                      'ukai+watch@chromium.org',
                      'vmpstr+watch@chromium.org'],
     'clipboard': ['dcheng@chromium.org'],
-    'codereview_settings': ['agable+watch@chromium.org'],
     'components_deps': ['droger+watchlist@chromium.org'],
     'compositor_animator': ['mdjones+watch@chromium.org'],
     'content_bluetooth': ['mattreynolds+watch@chromium.org',
diff --git a/codereview.settings b/codereview.settings
index 15b308e0f5a4a..ad0669463be84 100644
--- a/codereview.settings
+++ b/codereview.settings
@@ -1,6 +1,5 @@
 # This file is used by git-cl to get repository specific information.
 PROJECT: chromium
-CODE_REVIEW_SERVER: codereview.chromium.org
 GERRIT_HOST: True
 CC_LIST: chromium-reviews@chromium.org
 VIEW_VC: https://chromium.googlesource.com/chromium/src/+/
diff --git a/infra/OWNERS b/infra/OWNERS
index dde5cb63a108b..ab49b0ef0486d 100644
--- a/infra/OWNERS
+++ b/infra/OWNERS
@@ -1,10 +1,10 @@
 # This is reserved for people that are comfortable with Chromium builders
 # and understand the implications of changing their configurations.
 
-agable@chromium.org
 bpastene@chromium.org
 dpranke@chromium.org
 dpranke@google.com
+estaab@chromium.org
 gbeaty@chromium.org
 hans@chromium.org
 kbr@chromium.org
diff --git a/tools/infra/OWNERS b/tools/infra/OWNERS
index fd40000519302..797eddd5c9359 100644
--- a/tools/infra/OWNERS
+++ b/tools/infra/OWNERS
@@ -1,4 +1,3 @@
-agable@chromium.org
 gbeaty@chromium.org
 martiniss@chromium.org