diff --git a/.travis.yml b/.travis.yml
index c0b961a1d6..068339f5a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,10 @@ script:
   - mvn -q clean install -P checkstyle
   - docker build --build-arg JAR_FILE=./infomodelrepository.jar -f repository/repository-server/Dockerfile -t eclipsevorto/vorto-repo:latest ./repository/repository-server;
   - docker build --build-arg JAR_FILE=./generator-runner-exec.jar -f generators/generator-runner/Dockerfile -t eclipsevorto/vorto-generators:latest ./generators/generator-runner;
+  - if [ -n "$TRAVIS_TAG" ];
+  docker build --build-arg JAR_FILE=./infomodelrepository.jar -f repository/repository-server/Dockerfile -t eclipsevorto/vorto-repo:$TRAVIS_TAG ./repository/repository-server;
+  docker build --build-arg JAR_FILE=./generator-runner-exec.jar -f generators/generator-runner/Dockerfile -t eclipsevorto/vorto-generators:$TRAVIS_TAG ./generators/generator-runner;
+  fi
 
 deploy:
   provider: script
diff --git a/repository/repository-core/src/main/java/org/eclipse/vorto/repository/sso/TokenUtils.java b/repository/repository-core/src/main/java/org/eclipse/vorto/repository/sso/TokenUtils.java
index eba3d4c284..1e81c9fbdb 100644
--- a/repository/repository-core/src/main/java/org/eclipse/vorto/repository/sso/TokenUtils.java
+++ b/repository/repository-core/src/main/java/org/eclipse/vorto/repository/sso/TokenUtils.java
@@ -1,13 +1,13 @@
 /**
  * Copyright (c) 2018 Contributors to the Eclipse Foundation
- * <p>
+ *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
- * <p>
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0
- * <p>
+ *
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.vorto.repository.sso;
diff --git a/repository/repository-core/src/main/java/org/eclipse/vorto/repository/web/core/ModelDtoFactory.java b/repository/repository-core/src/main/java/org/eclipse/vorto/repository/web/core/ModelDtoFactory.java
index 38959bbbef..9d724f87eb 100644
--- a/repository/repository-core/src/main/java/org/eclipse/vorto/repository/web/core/ModelDtoFactory.java
+++ b/repository/repository-core/src/main/java/org/eclipse/vorto/repository/web/core/ModelDtoFactory.java
@@ -1,13 +1,13 @@
 /**
  * Copyright (c) 2018 Contributors to the Eclipse Foundation
- * <p>
+ *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
- * <p>
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0
- * <p>
+ *
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.vorto.repository.web.core;
diff --git a/repository/repository-server/Dockerfile b/repository/repository-server/Dockerfile
index c65f90c02a..3167514705 100644
--- a/repository/repository-server/Dockerfile
+++ b/repository/repository-server/Dockerfile
@@ -1,9 +1,10 @@
 FROM java:8
 # Add folder to hold jar file
-ARG JAR_FILE
+RUN mkdir /code
 WORKDIR /code
-VOLUME /root/.vorto
+ARG JAR_FILE
 VOLUME /code
+VOLUME /root/.vorto
 RUN apt-get update && apt-get install -y jq sed
 ADD ./target/${JAR_FILE} /code/infomodelrepository.jar
 ADD ./docker/run.sh /code