diff --git a/Dockerfile b/Dockerfile
index 91b19277df397a3fab4d9c867fcd89edcda4d486..a7314b92e92f3642b8b805cd4b64a90cebe702fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,17 @@ COPY docker/runner/config/application.tmpl /config/application.tmpl
 COPY docker/runner/README.md docker/runner/run.sh /
 COPY target/portal-backend-1.0.0-docker-packaging.jar backend.jar
 
+# org.label-schema.build-date=$BUILD_DATE
+# org.label-schema.vcs-ref=$VCS_REF
+LABEL org.label-schema.schema-version="1.0" \
+        org.label-schema.license="AGPLv3" \
+        org.label-schema.name="portal-backend" \
+        org.label-schema.description="Java backend for the MIP portal" \
+        org.label-schema.url="https://mip.humanbrainproject.eu" \
+        org.label-schema.vendor="LREN CHUV" \
+        org.label-schema.docker.dockerfile="Dockerfile" \
+        org.label-schema.memory-hint="2048"
+
 EXPOSE 8080
 
 CMD ["./run.sh"]
diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
index 53035fa9465b946ca3605d412d6ca6f251ecdbbb..21ea7f2d4d6a36cc56f3bd03eb9212588195c89a 100644
--- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
@@ -57,6 +57,7 @@ import java.net.URLEncoder;
 import java.security.Principal;
 
 // See https://spring.io/guides/tutorials/spring-boot-oauth2/ for reference about configuring OAuth2 login
+// also http://cscarioni.blogspot.ch/2013/04/pro-spring-security-and-oauth-2.html
 
 /**
  * Configuration for security.