diff --git a/prog/weave-npc/Dockerfile b/prog/weave-npc/Dockerfile
index 4e011ac5..86e366a7 100644
--- a/prog/weave-npc/Dockerfile
+++ b/prog/weave-npc/Dockerfile
@@ -1,4 +1,13 @@
 FROM alpine
+
+LABEL maintainer "Weaveworks Inc <help@weave.works>"
+LABEL works.weave.role=system \
+      org.label-schema.name="Weave Net" \
+      org.label-schema.description="Weave Net creates a virtual network that connects Docker containers across multiple hosts and enables their automatic discovery" \
+      org.label-schema.url="https://weave.works" \
+      org.label-schema.vcs-url="https://github.com/weaveworks/weave" \
+      org.label-schema.vendor="Weaveworks"
+
 RUN apk add --update \
     iptables \
     ipset \
diff --git a/prog/weavedb/Dockerfile b/prog/weavedb/Dockerfile
index 6c3e468b..6482dc2b 100644
--- a/prog/weavedb/Dockerfile
+++ b/prog/weavedb/Dockerfile
@@ -1,6 +1,6 @@
 # This is a nearly-empty image that we use to create a data-only container for persistence
 FROM scratch
-MAINTAINER Weaveworks Inc <help@weave.works>
+LABEL maintainer "Weaveworks Inc <help@weave.works>"
 ENTRYPOINT ["data-only"]
 # Work round Docker refusing to save an empty image
 COPY Dockerfile /
diff --git a/prog/weaveexec/Dockerfile b/prog/weaveexec/Dockerfile
index 155b2ddb..b490d8df 100644
--- a/prog/weaveexec/Dockerfile
+++ b/prog/weaveexec/Dockerfile
@@ -1,7 +1,12 @@
 FROM alpine
 
-MAINTAINER Weaveworks Inc <help@weave.works>
-LABEL works.weave.role=system
+LABEL maintainer "Weaveworks Inc <help@weave.works>"
+LABEL works.weave.role=system \
+      org.label-schema.name="Weave Net" \
+      org.label-schema.description="Weave Net creates a virtual network that connects Docker containers across multiple hosts and enables their automatic discovery" \
+      org.label-schema.url="https://weave.works" \
+      org.label-schema.vcs-url="https://github.com/weaveworks/weave" \
+      org.label-schema.vendor="Weaveworks"
 
 WORKDIR /home/weave
 ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"]
diff --git a/prog/weaver/Dockerfile.template b/prog/weaver/Dockerfile.template
index 876f1586..e83538be 100644
--- a/prog/weaver/Dockerfile.template
+++ b/prog/weaver/Dockerfile.template
@@ -1,6 +1,4 @@
 FROM DOCKERHUB_USER/weaveexec
-MAINTAINER Weaveworks Inc <help@weave.works>
-LABEL works.weave.role=system
 WORKDIR /home/weave
 ADD ./weaver /home/weave/
 ADD weavedata.db /weavedb/