diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d02b21b1..6c2a3e14 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,4 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # They will be requested for
 # review when someone opens a pull request.
-*       @tsurdilo @ricardozanini @manuelstein @cdavernas @antmendoza
\ No newline at end of file
+*       @tsurdilo @ricardozanini @cdavernas @antmendoza
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 6b6ca971..3069626e 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,6 +1,5 @@
 # Serverless Workflow Org Maintainers
 
-* [Manuel Stein](https://github.com/manuelstein)
 * [Tihomir Surdilovic](https://github.com/tsurdilo)
 * [Ricardo Zanini](https://github.com/ricardozanini)
 * [Charles d'Avernas](https://github.com/cdavernas)
diff --git a/OWNERS b/OWNERS
index ce5aec08..9e326158 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,7 +1,6 @@
 # See the GOVERNANCE.md document for the definition of the roles and responsibilities
 maintainers:
   - tsurdilo
-  - manuelstein
   - ricardozanini
   - cdavernas
   - antmendoza