diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 977b2767a..54f616edb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,7 +2,7 @@
 # Unless a later match takes precedence, global owners below will be
 # requested for review when someone opens a pull request.
 
-* @GiannaP @colluca @paulsc96
+* @fischeti @colluca @paulsc96
 
-target/sim/sw @colluca @viv-eth
+target/sim/sw @colluca @viv-eth @fischeti
 target/fpga @niwis @CyrilKoe
\ No newline at end of file