diff --git a/build.sh b/build.sh
index a89fb3a623e2add76e5a8e7c76946f301d6e5e0d..da082965a2e6031466986109c772b15e09fb9cf4 100755
--- a/build.sh
+++ b/build.sh
@@ -3,4 +3,8 @@
 ./halt.sh
 docker-compose -f ./docker-compose_build.yml build
 docker-compose -f ./docker-compose_build.yml up -d
-docker-compose stop db
\ No newline at end of file
+
+until [ -e ./target/backend-services-DOCKER_BUILD.jar ]; do
+  echo 'Waiting...'
+  sleep 1
+done
diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh
index eb11327377e7eae4097f5405c09fd0a6351f5f50..df6b8c08582e432c14752be3deaa03698c56ae93 100644
--- a/src/docker/build/build-in-docker.sh
+++ b/src/docker/build/build-in-docker.sh
@@ -9,7 +9,7 @@ until psql -h "db" -U "postgres" -c '\l'; do
   sleep 1
 done
 
-if [$(psql -h "db" -U "postgres" -c "\dt" | grep schema_version | wc -l) == 0]; then
+if [ $(psql -h "db" -U "postgres" -c "\dt" | grep schema_version | wc -l) == 0 ]; then
   mvn flyway:baseline
 fi