diff --git a/Dockerfile b/Dockerfile
index eec1acbedd0bbef1afe4b8a93ef197057ce502f9..104cf84c6915576e735040c8d9683267b7669874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,5 @@
 FROM golang:1.8.3-alpine
 
-MAINTAINER Ed Rooth <ed.rooth@coreos.com>
-MAINTAINER Lucas Servén <lucas.serven@coreos.com>
-MAINTAINER Rithu John <rithu.john@coreos.com>
-
 RUN apk add --no-cache --update alpine-sdk
 
 COPY . /go/src/github.com/coreos/dex
diff --git a/MAINTAINERS b/MAINTAINERS
index 36dda475a3deb0bcb09b269bddf32f8c344cfd6c..1bdc9d60674e01d4b3eca255ecbf4f06440f35fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,2 @@
-Ed Rooth <ed.rooth@coreos.com> (@sym3tri)
-Lucas Servén <lucas.serven@coreos.com> (@squat)
+Eric Chiang <eric.chiang@coreos.com> (@ericchiang)
 Rithu John <rithu.john@coreos.com> (@rithujohn191)