diff --git a/clean.sh b/clean.sh
index 41fc76f1b9a44f265e501ad41d429c13c08dd60e..f46a6c89e21a88f468a67f27c1b0acfbd62095c5 100755
--- a/clean.sh
+++ b/clean.sh
@@ -3,3 +3,4 @@
 ./halt.sh
 sudo rm -r ./.m2/
 sudo rm -r ./target/
+sudo rm -f ./data/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index df1c7f0bf7cbb8478ac6fa14ce9f92dd99d5b5e1..29d63572dbce3cbb43f1f3aeed9c99092224e6cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,6 @@ services:
       ports:
         - "5432:5432"
       volumes:
-        - ./data:/var/lib/postgres/data
+        - ./data:/var/lib/postgres/
       environment:
         POSTGRES_USER: postgres
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index 877c4ebf353bf279ee36812e982f0a271ed32bc6..2e2636daa2434993bed4d5f9a43553bcb6afbebb 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -19,6 +19,6 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./data:/var/lib/postgres/data
+      - ./data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: postgres
diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh
index 70736859ae4b73ec68b63ed8fec5cfe1596ff8d5..eb11327377e7eae4097f5405c09fd0a6351f5f50 100644
--- a/src/docker/build/build-in-docker.sh
+++ b/src/docker/build/build-in-docker.sh
@@ -9,7 +9,11 @@ until psql -h "db" -U "postgres" -c '\l'; do
   sleep 1
 done
 
-mvn flyway:baseline flyway:migrate
+if [$(psql -h "db" -U "postgres" -c "\dt" | grep schema_version | wc -l) == 0]; then
+  mvn flyway:baseline
+fi
+
+mvn flyway:migrate
 
 # Uncomment to generate a PDF API documentation
 # mvn swagger2markup:convertSwagger2markup asciidoctor:process-asciidoc