diff --git a/Dockerfile b/Dockerfile
index e93efdf3e9525cdc8efa0eb13e951cb990ce9054..152860d0355fa9628810e275eeb2744b20e59b34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,9 @@ RUN apk add --update ca-certificates wget &&  rm -rf /var/cache/apk/* /tmp/* &&
 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
 COPY ./docker/runner/config/application.tmpl /config/application.tmpl
 COPY ./docker/runner/README.md /
+COPY ./target/portal-backend-DOCKER_BUILD.jar backend.jar
 
 EXPOSE 8080
 
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 3cd9e990f1c1a15641a917931ecac50076c57e54..e29bec4b25b1e9cf3709fc2889d84fee442e18ae 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,4 +1,5 @@
-FROM maven:3-jdk-8
+# Pull base image
+FROM maven:3.3.9-jdk-8
 
 MAINTAINER mirco.nasuti@chuv.ch
 
@@ -8,7 +9,9 @@ USER build
 
 COPY ./docker/builder/build-in-docker.sh /
 
-VOLUME /opt/portal/
-WORKDIR /opt/portal/
+# Volume
+VOLUME /build
+# Define working directory
+WORKDIR /build
 
 CMD ["/build-in-docker.sh"]
diff --git a/captain.yml b/captain.yml
index 6ece2f343b07cfb79604a66b67949ed4881c842a..b60b3172df8c15b0ed9d99838dcd44fcf5e3e8ad 100644
--- a/captain.yml
+++ b/captain.yml
@@ -5,10 +5,12 @@ builder:
   build: Dockerfile.builder
   image: portal-backend-builder
   pre:
-    - echo "Building portal backend builder"
+    - echo "Building portal backend builder image"
   post:
-    - docker run --rm -v $WORKSPACE:/opt/portal/ -v $HOME/.m2:/home/build/.m2/ hbpmip/portal-backend-build
-    - echo "Finished building portal backend builder"
+    - echo "Finished building portal backend builder image"
+    - echo "Building project..."
+    - docker run --rm -v $WORKSPACE:/build/ -v $HOME/.m2:/home/build/.m2/ portal-backend-builder
+    - echo "Finished building project"
   test:
     - ./tests/test-build.sh
 
@@ -16,9 +18,9 @@ portal-backend:
   build: Dockerfile
   image: hbpmip/portal-backend
   pre:
-    - echo "Building portal-backend"
+    - echo "Building portal-backend image"
   post:
-    - echo "Finished building portal-backend"
+    - echo "Finished building portal-backend image"
   test:
     - ./tests/pre-test-run.sh
     - ./tests/test-run.sh