diff --git a/CODEOWNERS b/CODEOWNERS
index 724b95aa95fa9..03c96b1ef98e1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -40,11 +40,11 @@ meson.build @dbaker @eric
 ##########
 
 # NIR
-/src/compiler/nir/ @jekstrand
+/src/compiler/nir/ @gfxstrand
 
 # Vulkan
-/src/vulkan/ @eric @jekstrand
-/include/vulkan/ @eric @jekstrand
+/src/vulkan/ @eric @gfxstrand
+/include/vulkan/ @eric @gfxstrand
 
 
 #############
@@ -125,11 +125,11 @@ meson.build @dbaker @eric
 /src/imagination/rogue/ @simon-perretta-img
 
 # Intel
-/include/drm-uapi/i915_drm.h @kwg @llandwerlin @jekstrand @idr
-/include/pci_ids/i*_pci_ids.h @kwg @llandwerlin @jekstrand @idr
-/src/intel/ @kwg @llandwerlin @jekstrand @idr
-/src/gallium/winsys/iris/ @kwg @llandwerlin @jekstrand @idr
-/src/gallium/drivers/iris/ @kwg @llandwerlin @jekstrand @idr
+/include/drm-uapi/i915_drm.h @kwg @llandwerlin @gfxstrand @idr
+/include/pci_ids/i*_pci_ids.h @kwg @llandwerlin @gfxstrand @idr
+/src/intel/ @kwg @llandwerlin @gfxstrand @idr
+/src/gallium/winsys/iris/ @kwg @llandwerlin @gfxstrand @idr
+/src/gallium/drivers/iris/ @kwg @llandwerlin @gfxstrand @idr
 /src/gallium/drivers/i915/ @anholt
 
 # Microsoft