diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent
index 7bcf8533d..508c7a994 100644
--- a/docker/Dockerfile.cloud-agent
+++ b/docker/Dockerfile.cloud-agent
@@ -1,5 +1,5 @@
 FROM alpine:3.5
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 LABEL works.weave.role=system
 WORKDIR /home/weave
 RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \
diff --git a/extras/example/app/Dockerfile b/extras/example/app/Dockerfile
index 1f3d09610..f368aaf48 100644
--- a/extras/example/app/Dockerfile
+++ b/extras/example/app/Dockerfile
@@ -1,5 +1,5 @@
 FROM tatsushid/tinycore-python:2.7
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD requirements.txt /home/weave/
 RUN pip install -r /home/weave/requirements.txt
diff --git a/extras/example/client/Dockerfile b/extras/example/client/Dockerfile
index 67ea58f5a..1a71e88ee 100644
--- a/extras/example/client/Dockerfile
+++ b/extras/example/client/Dockerfile
@@ -1,5 +1,5 @@
 FROM tatsushid/tinycore-python:2.7
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD requirements.txt /home/weave/
 RUN pip install -r /home/weave/requirements.txt
diff --git a/extras/example/echo/Dockerfile b/extras/example/echo/Dockerfile
index c7d1bcb52..598991e66 100644
--- a/extras/example/echo/Dockerfile
+++ b/extras/example/echo/Dockerfile
@@ -1,5 +1,5 @@
 FROM tatsushid/tinycore-python:2.7
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD requirements.txt /home/weave/
 RUN pip install -r /home/weave/requirements.txt
diff --git a/extras/example/frontend-k8s/Dockerfile b/extras/example/frontend-k8s/Dockerfile
index d325d7619..240588f4a 100644
--- a/extras/example/frontend-k8s/Dockerfile
+++ b/extras/example/frontend-k8s/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 RUN apt-get update && \
   apt-get install -y nginx && \
   rm -rf /var/lib/apt/lists/*
diff --git a/extras/example/frontend/Dockerfile b/extras/example/frontend/Dockerfile
index d325d7619..240588f4a 100644
--- a/extras/example/frontend/Dockerfile
+++ b/extras/example/frontend/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 RUN apt-get update && \
   apt-get install -y nginx && \
   rm -rf /var/lib/apt/lists/*
diff --git a/extras/example/qotd/Dockerfile b/extras/example/qotd/Dockerfile
index 7f71ba66c..9774ffa87 100644
--- a/extras/example/qotd/Dockerfile
+++ b/extras/example/qotd/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD ./qotd /home/weave/
 EXPOSE 4446
diff --git a/extras/example/searchapp/Dockerfile b/extras/example/searchapp/Dockerfile
index 0d9219949..aed30d5fd 100644
--- a/extras/example/searchapp/Dockerfile
+++ b/extras/example/searchapp/Dockerfile
@@ -1,5 +1,5 @@
 FROM progrium/busybox
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD searchapp /home/weave/
 EXPOSE 8080
diff --git a/extras/example/shout/Dockerfile b/extras/example/shout/Dockerfile
index 57bda117f..85930944f 100644
--- a/extras/example/shout/Dockerfile
+++ b/extras/example/shout/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:latest
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD shout /home/weave/
 EXPOSE 8090
diff --git a/extras/example/trace_app/Dockerfile b/extras/example/trace_app/Dockerfile
index 1f3d09610..f368aaf48 100644
--- a/extras/example/trace_app/Dockerfile
+++ b/extras/example/trace_app/Dockerfile
@@ -1,5 +1,5 @@
 FROM tatsushid/tinycore-python:2.7
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /home/weave
 ADD requirements.txt /home/weave/
 RUN pip install -r /home/weave/requirements.txt
diff --git a/tools/socks/Dockerfile b/tools/socks/Dockerfile
index 867cd6bc5..ffafeb03b 100644
--- a/tools/socks/Dockerfile
+++ b/tools/socks/Dockerfile
@@ -1,5 +1,5 @@
 FROM gliderlabs/alpine
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer="Weaveworks Inc <help@weave.works>"
 WORKDIR /
 COPY proxy /
 EXPOSE 8000