diff --git a/Dockerfile b/Dockerfile
index 7e9122b..b16159a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-# REPOSITORY https://github.com/docker/docker-bench-security
-
 FROM alpine:3.2
 
-ENV VERSION 1.10.0
+LABEL org.label-schema.name="docker-bench-security" \
+      org.label-schema.url="https://dockerbench.com" \
+      org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
 
-MAINTAINER dockerbench.com
+ENV VERSION 1.10.0
 
 WORKDIR /usr/bin
 
diff --git a/distros/Dockerfile.alpine b/distros/Dockerfile.alpine
index 7e9122b..b16159a 100644
--- a/distros/Dockerfile.alpine
+++ b/distros/Dockerfile.alpine
@@ -1,10 +1,10 @@
-# REPOSITORY https://github.com/docker/docker-bench-security
-
 FROM alpine:3.2
 
-ENV VERSION 1.10.0
+LABEL org.label-schema.name="docker-bench-security" \
+      org.label-schema.url="https://dockerbench.com" \
+      org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
 
-MAINTAINER dockerbench.com
+ENV VERSION 1.10.0
 
 WORKDIR /usr/bin
 
diff --git a/distros/Dockerfile.debian b/distros/Dockerfile.debian
index f208d6f..0833424 100644
--- a/distros/Dockerfile.debian
+++ b/distros/Dockerfile.debian
@@ -1,8 +1,8 @@
-# REPOSITORY https://github.com/konstruktoid/docker-bench-security/
-
 FROM debian:sid
 
-MAINTAINER Thomas Sjögren <konstruktoid@users.noreply.github.com>
+LABEL org.label-schema.name="docker-bench-security" \
+      org.label-schema.url="https://github.com/konstruktoid/docker-bench-security" \
+      org.label-schema.vcs-url="https://github.com/konstruktoid/docker-bench-security.git"
 
 RUN \
     apt-get update && \