diff --git a/1.10.0/Dockerfile b/1.10.0/Dockerfile
index 153153f..2f4be4d 100644
--- a/1.10.0/Dockerfile
+++ b/1.10.0/Dockerfile
@@ -1,6 +1,17 @@
 FROM debian:jessie
 MAINTAINER Tibo Delor "delor.thibault@gmail.com"
 
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.docker.dockerfile="/Dockerfile" \
+    org.label-schema.license="MIT" \
+    org.label-schema.name="Docker Rust" \
+    org.label-schema.url="https://hub.docker.com/r/thibaultdelor/docker-rust" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-type="Git" \
+    org.label-schema.vcs-url="https://github.com/thibaultdelor/docker-rust"
+    
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install  --no-install-recommends -qqy curl ca-certificates build-essential \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/1.11.0/Dockerfile b/1.11.0/Dockerfile
index 012f547..66ef067 100644
--- a/1.11.0/Dockerfile
+++ b/1.11.0/Dockerfile
@@ -1,6 +1,17 @@
 FROM debian:jessie
 MAINTAINER Tibo Delor "delor.thibault@gmail.com"
 
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.docker.dockerfile="/Dockerfile" \
+    org.label-schema.license="MIT" \
+    org.label-schema.name="Docker Rust" \
+    org.label-schema.url="https://hub.docker.com/r/thibaultdelor/docker-rust" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-type="Git" \
+    org.label-schema.vcs-url="https://github.com/thibaultdelor/docker-rust"
+
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install  --no-install-recommends -qqy curl ca-certificates build-essential \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/hooks/build b/hooks/build
new file mode 100644
index 0000000..8aa5982
--- /dev/null
+++ b/hooks/build
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` -t $IMAGE_NAME .
\ No newline at end of file