diff --git a/docker/netdisco-backend/Dockerfile b/docker/netdisco-backend/Dockerfile
index 607fc0b2..c7e2177c 100644
--- a/docker/netdisco-backend/Dockerfile
+++ b/docker/netdisco-backend/Dockerfile
@@ -1,6 +1,9 @@
 # vim: ft=Dockerfile
 ARG TAG=master
-FROM docker.io/netdisco:${TAG}-base
+FROM docker.io/netdisco/netdisco:${TAG}-base
+
+LABEL org.netdisco.maintainer="The Netdisco Project"
+LABEL org.netdisco.version=${TAG}
 
 VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 
diff --git a/docker/netdisco-base/Dockerfile b/docker/netdisco-base/Dockerfile
index c7d30454..451f42ec 100644
--- a/docker/netdisco-base/Dockerfile
+++ b/docker/netdisco-base/Dockerfile
@@ -1,6 +1,10 @@
 # vim: ft=Dockerfile
+ARG TAG=master
 FROM debian:stable-slim
 
+LABEL org.netdisco.maintainer="The Netdisco Project"
+LABEL org.netdisco.version=${TAG}
+
 RUN bash -c 'mkdir -p /usr/share/man/man{1..8}' && \
     apt-get -yq update && \
     apt-get install -yq --no-install-recommends \
diff --git a/docker/netdisco-do/Dockerfile b/docker/netdisco-do/Dockerfile
index bf31934c..a52ee0bc 100644
--- a/docker/netdisco-do/Dockerfile
+++ b/docker/netdisco-do/Dockerfile
@@ -1,6 +1,9 @@
 # vim: ft=Dockerfile
 ARG TAG=master
-FROM docker.io/netdisco:${TAG}-base
+FROM docker.io/netdisco/netdisco:${TAG}-base
+
+LABEL org.netdisco.maintainer="The Netdisco Project"
+LABEL org.netdisco.version=${TAG}
 
 VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 
diff --git a/docker/netdisco-postgresql/Dockerfile b/docker/netdisco-postgresql/Dockerfile
index 9545f823..4502b86d 100644
--- a/docker/netdisco-postgresql/Dockerfile
+++ b/docker/netdisco-postgresql/Dockerfile
@@ -1,6 +1,10 @@
 # vim: ft=Dockerfile
+ARG TAG=master
 FROM docker.io/postgres:9.6.6-alpine
 
+LABEL org.netdisco.maintainer="The Netdisco Project"
+LABEL org.netdisco.version=${TAG}
+
 RUN apk add --no-cache \
   curl \
   jq \
diff --git a/docker/netdisco-web/Dockerfile b/docker/netdisco-web/Dockerfile
index 71c65198..a6b1acaa 100644
--- a/docker/netdisco-web/Dockerfile
+++ b/docker/netdisco-web/Dockerfile
@@ -1,6 +1,9 @@
 # vim: ft=Dockerfile
 ARG TAG=master
-FROM docker.io/netdisco:${TAG}-base
+FROM docker.io/netdisco/netdisco:${TAG}-base
+
+LABEL org.netdisco.maintainer="The Netdisco Project"
+LABEL org.netdisco.version=${TAG}
 
 EXPOSE 5000
 VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]