diff --git a/config/application.tmpl b/config/application.tmpl
index 5086566bd829d2e58d8921dbb52c888b2ab3d5aa..782770d88cc2ff98203dd6c802f57a5c5b0472a7 100644
--- a/config/application.tmpl
+++ b/config/application.tmpl
@@ -16,6 +16,7 @@ spring:
 security:
   enabled: false
 
+{{ if (not .Env.AUTHENTICATION) or (eq .Env.AUTHENTICATION "1") }}
 hbp:
   client:
     clientId: {{ default .Env.CLIENT_ID "996f97c5-a3ca-460e-b18b-00df3e2be89a" }}
@@ -27,6 +28,7 @@ hbp:
     clientAuthenticationScheme: form
   resource:
     userInfoUri: {{ default .Env.USER_INFO_URI "https://services.humanbrainproject.eu/oidc/userinfo" }}
+{{ end }}
 
 logging:
   level:
diff --git a/src/docker/run/Dockerfile b/src/docker/run/Dockerfile
index cc8d0655438ed1f00d3cc8e0b68d2a99b8d35630..719fff68465d828d8fd06842a3ea71f23acc65b2 100644
--- a/src/docker/run/Dockerfile
+++ b/src/docker/run/Dockerfile
@@ -2,12 +2,12 @@ FROM java:openjdk-8u92-jdk-alpine
 
 MAINTAINER mirco.nasuti@chuv.ch
 
-COPY ./target/portal-backend-DOCKER_BUILD.jar backend.jar
-
 RUN apk add --update ca-certificates wget &&  rm -rf /var/cache/apk/* /tmp/* && update-ca-certificates
 RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
 RUN tar -C /usr/local/bin -xvzf dockerize-linux-amd64-v0.2.0.tar.gz
 
+COPY ./target/portal-backend-DOCKER_BUILD.jar backend.jar
+
 CMD mkdir /config
 ADD ./config/application.tmpl /config/application.tmpl