diff --git a/ecs/Dockerfile b/ecs/Dockerfile
index cef4bae..3a5a9a3 100644
--- a/ecs/Dockerfile
+++ b/ecs/Dockerfile
@@ -29,6 +29,8 @@ RUN mkdir runtime \
 # Runtime container
 FROM alpine:3.9
 ARG VERSION
+ARG VCS_REF
+ARG BUILD_DATE
 ENV TERM=xterm \
     LC_ALL=C.UTF-8 \
     LANG=en_US.UTF-8 \
@@ -38,7 +40,16 @@ ENV TERM=xterm \
     VERSION=${VERSION:-latest}
 LABEL maintainer="ProcessOne <contact@process-one.net>" \
       product="Ejabberd Community Server" \
-      version=$VERSION
+      version=$VERSION \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/processone/docker-ejabberd" \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Ejabberd Community Server" \
+      org.label-schema.description="Robust, Scalable and Extensible Realtime Server using XMPP, MQTT and SIP" \
+      org.label-schema.url="https://www.ejabberd.im/" \
+      org.label-schema.vendor="ProcessOne" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
 
 # Create directory structure and user for ejabberd
 RUN addgroup ejabberd -g 9000 \
diff --git a/ecs/build.sh b/ecs/build.sh
index 5f4f548..89a8b52 100755
--- a/ecs/build.sh
+++ b/ecs/build.sh
@@ -3,5 +3,10 @@
 current=$(date +%y.%m)
 version=${1:-$current}
 
-docker build --build-arg VERSION=$version -t ejabberd/ecs:$version .
+docker build \
+    --build-arg VERSION=$version \
+    --build-arg VCS_REF=`git rev-parse --short HEAD` \
+    --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+    -t ejabberd/ecs:$version .
+
 [ "$version" = "latest" ] || docker tag ejabberd/ecs:$version ejabberd/ecs:latest