diff --git a/OWNERS b/OWNERS
index 568597f5d6207..dfba38eb5726a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -21,16 +21,6 @@ filters:
     emeritus_approvers:
       - jbeda
 
-  # Bazel build infrastructure changes often touch files throughout the tree
-  "\\.bzl$":
-    reviewers:
-      - ixdy
-    approvers:
-      - ixdy
-  "BUILD(\\.bazel)?$":
-    approvers:
-      - ixdy
-
   # go.{mod,sum} files relate to go dependencies, and should be reviewed by the
   # dep-approvers
   "go\\.(mod|sum)$":
diff --git a/build/visible_to/OWNERS b/build/visible_to/OWNERS
index 11a2e3904a10f..a725b3f0f57c9 100644
--- a/build/visible_to/OWNERS
+++ b/build/visible_to/OWNERS
@@ -3,7 +3,6 @@
 reviewers:
   - brendandburns
   - dchen1107
-  - ixdy
   - lavalamp
   - mikedanese
   - monopole
@@ -14,7 +13,6 @@ approvers:
   - bgrant0607
   - brendandburns
   - dchen1107
-  - ixdy
   - lavalamp
   - mikedanese
   - monopole
@@ -23,4 +21,5 @@ approvers:
   - thockin
   - wojtek-t
 emeritus_approvers:
-  - jbeda
\ No newline at end of file
+  - ixdy
+  - jbeda
diff --git a/cluster/images/conformance/OWNERS b/cluster/images/conformance/OWNERS
index 5300956ec2fc7..6e42b5463d994 100644
--- a/cluster/images/conformance/OWNERS
+++ b/cluster/images/conformance/OWNERS
@@ -3,7 +3,6 @@
 reviewers:
   - timothysc
   - dims
-  - ixdy
   - spiffxp
   - neolit123
   - bentheelder
@@ -13,10 +12,11 @@ reviewers:
 approvers:
   - timothysc
   - dims
-  - ixdy
   - spiffxp
   - neolit123
   - bentheelder
+emeritus_approvers:
+  - ixdy
 labels:
 - sig/release
 - sig/testing
diff --git a/hack/OWNERS b/hack/OWNERS
index 7e7476181293c..31decdbbf0591 100644
--- a/hack/OWNERS
+++ b/hack/OWNERS
@@ -4,7 +4,6 @@ reviewers:
   - bentheelder
   - cblecker
   - fejta
-  - ixdy
   - juanvallejo
   - hwdef
   - lavalamp
@@ -20,7 +19,6 @@ approvers:
   - deads2k
   - dims # for local-up-cluster related files
   - fejta
-  - ixdy
   - lavalamp
   - liggitt
   - pwittrock
@@ -32,5 +30,6 @@ approvers:
   - mikedanese
 emeritus_approvers:
   - eparis
+  - ixdy
   - jbeda
   - zmerlynn
diff --git a/test/images/OWNERS b/test/images/OWNERS
index 0f3640c0495e2..487084262a91e 100644
--- a/test/images/OWNERS
+++ b/test/images/OWNERS
@@ -7,5 +7,5 @@ approvers:
   - mkumatag
   - listx
 emeritus_approvers:
+  - ixdy
   - luxas
-  - ixdy
\ No newline at end of file
diff --git a/test/utils/image/OWNERS b/test/utils/image/OWNERS
index 62ecd84a7aa9e..17a47b35e5a9f 100644
--- a/test/utils/image/OWNERS
+++ b/test/utils/image/OWNERS
@@ -3,10 +3,10 @@
 reviewers:
   - luxas
   - mkumatag
-  - ixdy
   - listx
 approvers:
   - luxas
   - mkumatag
-  - ixdy
   - listx
+emeritus_approvers:
+  - ixdy
diff --git a/third_party/forked/shell2junit/OWNERS b/third_party/forked/shell2junit/OWNERS
index 57071e0e2474d..dcb760d06f4e1 100644
--- a/third_party/forked/shell2junit/OWNERS
+++ b/third_party/forked/shell2junit/OWNERS
@@ -2,11 +2,11 @@
 
 reviewers:
   - cblecker
-  - ixdy
   - mengqiy
   - pwittrock
 approvers:
   - cblecker
-  - ixdy
   - mengqiy
   - pwittrock
+emeritus_approvers:
+  - ixdy