diff --git a/Dockerfile b/Dockerfile
index 4f0d43a4..7ab96f92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.4
 
 MAINTAINER Ed Rooth <ed.rooth@coreos.com>
-MAINTAINER Eric Chiang <eric.chiang@coreos.com>
+MAINTAINER Lucas Servén <lucas.serven@coreos.com>
 MAINTAINER Rithu John <rithu.john@coreos.com>
 
 # Dex connectors, such as GitHub and Google logins require root certificates.
diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 00000000..36dda475
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,3 @@
+Ed Rooth <ed.rooth@coreos.com> (@sym3tri)
+Lucas Servén <lucas.serven@coreos.com> (@squat)
+Rithu John <rithu.john@coreos.com> (@rithujohn191)