diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index a4430802e..7835dff20 100644
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -13,15 +13,17 @@ if [[ "${SUCCESS}" -eq 00 ]] ; then
 fi
 
 
-#mvn clean install
-#if [[ "$?" -ne 0 ]] ; then
-#  exit y$?
-#fi
+mvn clean install
+if [[ "$?" -ne 0 ]] ; then
+  exit y$?
+fi
 
 cd -
 sh build_docker.sh
+if [[ "$?" -ne 0 ]] ; then
+  exit y$?
+fi
 
-echo "Do you want to run docker-compose?"
 while true; do
     read -p "Do you want to run docker-compose?" yn
     case ${yn} in
@@ -29,4 +31,4 @@ while true; do
         [Nn]* ) exit;;
         * ) echo "Please answer yes or no.";;
     esac
-done
\ No newline at end of file
+done
diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh
index f63329476..a6df2a453 100644
--- a/scripts/build_docker.sh
+++ b/scripts/build_docker.sh
@@ -3,8 +3,8 @@
 WEBGOAT_HOME=$(pwd)/../
 
 cd ${WEBGOAT_HOME}/webgoat-server
-docker build -t webgoat/webgoat-8.0 .
+docker build -t webgoat/webgoat-v8.0.0.snapshot .
 
 cd ${WEBGOAT_HOME}/webwolf
-docker build -t webgoat/webwolf .
+docker build -t webgoat/webwolf-v8.0.0.snapshot .
 
diff --git a/scripts/clean-run-docker-compose.sh b/scripts/clean-run-docker-compose.sh
index c804d8d36..b1e493b87 100644
--- a/scripts/clean-run-docker-compose.sh
+++ b/scripts/clean-run-docker-compose.sh
@@ -2,4 +2,4 @@
 
 cd ..
 docker-compose rm -f
-docker-compose up
+docker-compose -f docker-compose-local.yml up