diff --git a/Dockerfile b/Dockerfile
index 0fa0d80a..8da687b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,5 @@
 FROM golang:1.9.2-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 36dda475..1bdc9d60 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)