diff --git a/CODEOWNERS b/CODEOWNERS
index 4e83a6c..6eab643 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -8,19 +8,18 @@
 * @r2dedios @dmartinol @ikrispin @nemerna
 
 # Pack owners
-rh-sre/              @r2dedios @dmartinol
-rh-developer/        @ikrispin @r2dedios @dmartinol
-rh-virt/             @r2dedios @dmartinol
-ocp-admin/           @r2dedios @dmartinol
-rh-ai-engineer/      @ikrispin @r2dedios @dmartinol
-rh-automation/       @nemerna @r2dedios @dmartinol
-rh-basic/            @r2dedios @dmartinol
-rh-support-engineer/ 
+rh-sre/              @TomerFi @r2dedios @dmartinol
+rh-developer/        @TomerFi @ikrispin @r2dedios @dmartinol
+rh-virt/             @TomerFi @r2dedios @dmartinol
+ocp-admin/           @TomerFi @r2dedios @dmartinol
+rh-ai-engineer/      @TomerFi @ikrispin @r2dedios @dmartinol
+rh-automation/       @TomerFi @nemerna @r2dedios @dmartinol
+rh-basic/            @TomerFi @r2dedios @dmartinol
 
 # CI, scripts, and repo-wide config
-.github/ @r2dedios @dmartinol
-scripts/ @r2dedios @dmartinol
-catalog/ @r2dedios @dmartinol
-CLAUDE.md @r2dedios @dmartinol
-SKILL_DESIGN_PRINCIPLES.md @r2dedios @dmartinol
-CONTRIBUTING.md @r2dedios @dmartinol
+.github/ @TomerFi @r2dedios @dmartinol
+scripts/ @TomerFi @r2dedios @dmartinol
+catalog/ @TomerFi @r2dedios @dmartinol
+CLAUDE.md @TomerFi @r2dedios @dmartinol
+SKILL_DESIGN_PRINCIPLES.md @TomerFi @r2dedios @dmartinol
+CONTRIBUTING.md @TomerFi @r2dedios @dmartinol