diff --git a/build.sh b/build.sh
index da082965a2e6031466986109c772b15e09fb9cf4..e29e8d77076c421f9f0a98bc49d4d61b9454c2bd 100755
--- a/build.sh
+++ b/build.sh
@@ -2,9 +2,4 @@
 
 ./halt.sh
 docker-compose -f ./docker-compose_build.yml build
-docker-compose -f ./docker-compose_build.yml up -d
-
-until [ -e ./target/backend-services-DOCKER_BUILD.jar ]; do
-  echo 'Waiting...'
-  sleep 1
-done
+docker-compose -f ./docker-compose_build.yml run --rm backend_build
diff --git a/docker-compose.yml b/docker-compose.yml
index 29d63572dbce3cbb43f1f3aeed9c99092224e6cf..16e2a9cfd961d8398837ad58895fe7a324dbf4a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,11 +13,11 @@ services:
     links:
       - "db"
   db:
-      container_name: db
-      image: postgres:9.5.3
-      ports:
-        - "5432:5432"
-      volumes:
-        - ./data:/var/lib/postgres/
-      environment:
-        POSTGRES_USER: postgres
+    container_name: db
+    image: postgres:9.5.3
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./postgresql:/var/lib/postgresql
+    environment:
+      POSTGRES_USER: postgres
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index 2e2636daa2434993bed4d5f9a43553bcb6afbebb..a554fa6ca460b2e6c75259e81a37f5da0d5011ee 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -19,6 +19,6 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./data:/var/lib/postgresql/data
+      - ./postgresql:/var/lib/postgresql
     environment:
       POSTGRES_USER: postgres
diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh
index df6b8c08582e432c14752be3deaa03698c56ae93..44f5005d0b45ae5fe5dfe8c255df72f6c0907756 100644
--- a/src/docker/build/build-in-docker.sh
+++ b/src/docker/build/build-in-docker.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
+echo 'Removing old target folder...'
 rm -r target/
+
+echo 'Packaging...'
 mvn package
 
 echo 'Waiting for postgres to be ready...'
@@ -10,9 +13,11 @@ until psql -h "db" -U "postgres" -c '\l'; do
 done
 
 if [ $(psql -h "db" -U "postgres" -c "\dt" | grep schema_version | wc -l) == 0 ]; then
+  echo 'Generating database baseline...'
   mvn flyway:baseline
 fi
 
+echo 'Migrating database...'
 mvn flyway:migrate
 
 # Uncomment to generate a PDF API documentation