diff --git a/CODEOWNERS b/CODEOWNERS
index 3af1ab1b..e5875885 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1,2 @@
-* @metonym
\ No newline at end of file
+* @metonym
+* @josefaidt
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 4a6a2bc5..4388eb8a 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,5 +1,5 @@
 # Maintainers
 
-Eric Liu - eric.young.liu@ibm.com
+[Eric Liu](https://github.com/metonym) - eric.young.liu@ibm.com
 
-Josef Aidt - josef.aidt@gmail.com
+[Josef Aidt](https://github.com/josefaidt) - josef.aidt@gmail.com