diff --git a/CODEOWNERS b/CODEOWNERS
index 8ea521ce8d..7d66f7805e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1,7 @@
 # Core
-/ghcide @pepeiborra
-/ghcide/session-loader @pepeiborra @fendor
-/hls-graph @pepeiborra
+/ghcide @wz1000
+/ghcide/session-loader @wz1000 @fendor
+/hls-graph @wz1000
 /hls-plugin-api @michaelpj @fendor
 /hls-test-utils @fendor
 /hie-compat @wz1000
@@ -22,7 +22,7 @@
 /plugins/hls-code-range-plugin @kokobd
 /plugins/hls-eval-plugin
 /plugins/hls-explicit-fixity-plugin
-/plugins/hls-explicit-imports-plugin @pepeiborra
+/plugins/hls-explicit-imports-plugin 
 /plugins/hls-explicit-record-fields-plugin @ozkutuk
 /plugins/hls-floskell-plugin @peterbecich
 /plugins/hls-fourmolu-plugin @georgefst
@@ -36,15 +36,15 @@
 /plugins/hls-qualify-imported-names-plugin @eddiemundo
 /plugins/hls-refactor-plugin @santiweight
 /plugins/hls-rename-plugin
-/plugins/hls-retrie-plugin @pepeiborra
+/plugins/hls-retrie-plugin @wz1000
 /plugins/hls-semantic-tokens-plugin @soulomoon
 /plugins/hls-splice-plugin @konn
 /plugins/hls-stan-plugin @0rphee
 /plugins/hls-stylish-haskell-plugin @michaelpj
 
 # Benchmarking
-/shake-bench @pepeiborra
-/bench @pepeiborra
+/shake-bench 
+/bench 
 
 # Docs
 /docs @michaelpj