diff --git a/tensorflow/contrib/makefile/Dockerfile b/tensorflow/contrib/makefile/Dockerfile
index 341f22e6926..64d571a4edf 100644
--- a/tensorflow/contrib/makefile/Dockerfile
+++ b/tensorflow/contrib/makefile/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04
 
-MAINTAINER Gunhan Gulsoy <gunan@google.com>
+LABEL maintainer="Gunhan Gulsoy <gunan@google.com>"
 
 # Install make build dependencies for TensorFlow.
 RUN apt-get update
diff --git a/tensorflow/examples/udacity/Dockerfile b/tensorflow/examples/udacity/Dockerfile
index 3d48ced41b2..3ca58566c1d 100644
--- a/tensorflow/examples/udacity/Dockerfile
+++ b/tensorflow/examples/udacity/Dockerfile
@@ -1,5 +1,5 @@
 FROM gcr.io/tensorflow/tensorflow:latest
-MAINTAINER Vincent Vanhoucke <vanhoucke@google.com>
+LABEL maintainer="Vincent Vanhoucke <vanhoucke@google.com>"
 
 # Pillow needs libjpeg by default as of 3.0.
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/tensorflow/tools/ci_build/Dockerfile.pi-python3 b/tensorflow/tools/ci_build/Dockerfile.pi-python3
index 18b131ea19f..b1c648ba301 100644
--- a/tensorflow/tools/ci_build/Dockerfile.pi-python3
+++ b/tensorflow/tools/ci_build/Dockerfile.pi-python3
@@ -1,6 +1,6 @@
 FROM ubuntu:14.04
 
-MAINTAINER Jan Prach <jendap@google.com>
+LABEL maintainer="Jan Prach <jendap@google.com>"
 
 # Copy and run the install scripts.
 COPY install/*.sh /install/