diff --git a/CODEOWNERS b/CODEOWNERS
index 1b5130e0b6..6d452e3665 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -5,9 +5,9 @@ openmc/data/ @paulromano
 openmc/lib/ @paulromano
 
 # Depletion
-openmc/deplete/ @drewejohnson
-tests/regression_tests/deplete/ @drewejohnson
-tests/unit_tests/test_deplete_*.py @drewejohnson
+openmc/deplete/ @paulromano
+tests/regression_tests/deplete/ @paulromano
+tests/unit_tests/test_deplete_*.py @paulromano
 
 # MG-related functionality
 openmc/mgxs_library.py @nelsonag
@@ -26,6 +26,12 @@ src/dagmc.cpp @pshriwise
 tests/regression_tests/dagmc/ @pshriwise
 tests/unit_tests/dagmc/ @pshriwise
 
+# Weight windows
+openmc/weight_windows.py @pshriwise
+openmc/lib/weight_windows.py @pshriwise
+src/weight_windows.py @pshriwise
+tests/unit_tests/weightwindows/ @pshriwise
+
 # Photon transport
 openmc/data/BREMX.DAT @amandalund
 openmc/data/compton_profiles.h5 @amandalund
@@ -49,3 +55,12 @@ openmc/data/resonance_covariance.py @icmeyer
 
 # Docker
 Dockerfile @shimwell
+
+# Random ray
+src/random_ray/ @jtramm
+
+# NCrystal interface
+src/ncrystal_interface.cpp @marquezj
+
+# MCPL interface
+src/mcpl_interface.cpp @ebknudsen