diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 23b5270..ce6b41b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,14 +1,18 @@
-version: "3.1"
+version: "2.1"
 
 services:
-  mysql:
+  db:
     image: mysql:5.7
     environment:
-      MYSQL_ROOT_PASSWORD: k2j32ks4
+      MYSQL_ROOT_PASSWORD: k2j32ks4    
     ports:
       - 3306:3306
     volumes:
       - ../db:/docker-entrypoint-initdb.d
+    healthcheck:
+      test: mysql --user=root --password=k2j32ks4 -e 'SHOW DATABASES'
+      timeout: 20s
+      retries: 10
     networks:
       - greatquotes
 
@@ -17,7 +21,7 @@ services:
     ports:
       - 8085:8080
     depends_on:
-      - mysql
+      - db
     networks:
       - greatquotes
 
@@ -26,7 +30,8 @@ services:
     ports:
       - 8090:8080
     depends_on:
-      - mysql
+      db:
+        condition: service_healthy
     networks:
       - greatquotes
 
diff --git a/backend/test.ps1 b/scripts/build.ps1
similarity index 71%
rename from backend/test.ps1
rename to scripts/build.ps1
index d9747f5..90cf173 100644
--- a/backend/test.ps1
+++ b/scripts/build.ps1
@@ -4,10 +4,12 @@ echo "Removing all docker containers"
 docker rm $(docker ps -aq)
 echo "Removing all docker volumes"
 docker volume rm $(docker volume ls -q)
+cd ..\backend
 echo "Booting docker-compose test file"
-docker-compose --file ..\docker\docker-compose.yml up -d
+docker-compose --file ..\src\test\resources\docker-compose.yml up -d
 sleep 10
 echo "Starting build and tests"
-mvn clean test
+mvn package
 echo "Stopping all running docker containers"
-docker stop $(docker ps -aq)
\ No newline at end of file
+docker stop $(docker ps -aq)
+cd ..\scripts
diff --git a/scripts/build.sh b/scripts/build.sh
new file mode 100755
index 0000000..89ce0dd
--- /dev/null
+++ b/scripts/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+echo "Stopping all running docker containers"
+docker stop $(docker ps -aq)
+echo "Removing all docker containers"
+docker rm $(docker ps -aq)
+echo "Removing all docker volumes"
+docker volume rm $(docker volume ls -q)
+cd ../backend
+echo "Booting docker-compose test file"
+docker-compose --file src/test/resources/docker-compose.yml up -d
+sleep 10
+echo "Starting build and tests"
+mvn package
+echo "Stopping all running docker containers"
+docker stop $(docker ps -aq)
+cd ../scripts
+
diff --git a/scripts/run.ps1 b/scripts/run.ps1
new file mode 100644
index 0000000..4d00749
--- /dev/null
+++ b/scripts/run.ps1
@@ -0,0 +1,2 @@
+echo "Booting docker-compose production file"
+docker-compose --file .\docker\docker-compose.yml up --build
\ No newline at end of file
diff --git a/scripts/run.sh b/scripts/run.sh
new file mode 100755
index 0000000..cfcf5ff
--- /dev/null
+++ b/scripts/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "Booting docker-compose production file"
+docker-compose --file ../docker/docker-compose.yml up --build