diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8e8e53f6..a211cd9e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,2 @@
 * @ricardozanini
+* @fjtirado
diff --git a/.github/OWNERS b/.github/OWNERS
index 65579b4f..378a8d78 100644
--- a/.github/OWNERS
+++ b/.github/OWNERS
@@ -1,7 +1,9 @@
 reviewers:
   - ricardozanini
   - manick02
+  - fjtirado
 approvers:
   - ricardozanini
+  - fjtirado
 labels:
   - sig/contributor-experience
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 0c9d05b9..a7a6b525 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,4 +1,5 @@
 # Serverless Workflow Java SDK Maintainers
 
+* [Francisco Javier Tirado Sarti](https://github.com/fjtirado)
 * [Manick Sundaram](https://github.com/manick02)
 * [Ricardo Zanini](https://github.com/ricardozanini)