diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index da6a91edeb..be9e1e3e0a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,4 +4,4 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 # Owners will be requested for review when someone opens a PR.
-*       @greschd @janvonrickenbach @roosre
+*       @greschd @roosre @SRaimondi
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index fefd506689..36f0de4cb2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -3,8 +3,8 @@
 ## Project Lead
 
 * [Dominik Gresch](https://github.com/greschd)
-* [Jan von Rickenbach](https://github.com/janvonrickenbach)
 * [René Roos](https://github.com/roosre)
+* [Simone Raimondi](https://github.com/SRaimondi)
 
 ## Individual Contributors
 
@@ -15,3 +15,4 @@
 * [René Roos](https://github.com/roosre)
 * [Revathy Venugopal](https://github.com/Revathyvenugopal162)
 * [Roberto Pastor Muela](https://github.com/RobPasMue)
+* [Simone Raimondi](https://github.com/SRaimondi)