diff --git a/Dockerfile b/Dockerfile
index 7ec0591d..51100aec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
 ARG BASEIMAGE
 FROM ${BASEIMAGE}
 
-MAINTAINER Random Liu <lantaol@google.com>
+LABEL maintainer="Random Liu <lantaol@google.com>"
 
 RUN clean-install util-linux libsystemd0 bash
 
diff --git a/pkg/util/nethealth/Dockerfile b/pkg/util/nethealth/Dockerfile
index a1b2fded..13a28601 100644
--- a/pkg/util/nethealth/Dockerfile
+++ b/pkg/util/nethealth/Dockerfile
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 FROM busybox
-MAINTAINER Girish Kalele <gkalele@google.com>
+LABEL maintainer="Girish Kalele <gkalele@google.com>"
 COPY nethealth /usr/bin/
 ENTRYPOINT ["/usr/bin/nethealth"]
diff --git a/test/kernel_log_generator/Dockerfile b/test/kernel_log_generator/Dockerfile
index e248c82b..ce07a5f9 100644
--- a/test/kernel_log_generator/Dockerfile
+++ b/test/kernel_log_generator/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM bashell/alpine-bash
-MAINTAINER Random Liu <lantaol@google.com>
+LABEL maintainer="Random Liu <lantaol@google.com>"
 
 # Use oom kill problem as default
 ENV PROBLEM /problems/oom_kill