diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..f48cffb3a
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1 @@
+*	@src-d/data-processing
diff --git a/MAINTAINERS b/MAINTAINERS
index dc6817245..3ae18cb82 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1 +1,2 @@
+Miguel Molina <miguel@sourced.tech> (@erizocosmico)
 Antonio Navarro Perez <antonio@sourced.tech> (@ajnavarro)