diff --git a/Dockerfile b/Dockerfile
index b0c6c8f51a..604a72847e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,13 +36,11 @@ RUN echo ${RELEASE_STORE_FILE} | base64 -d >> app/navi-release-key.jks
 RUN bash -c " \
 
     if [ $FLAVOR = E2ETEST ] ; then \
-      echo "started" \
-      echo 'started for 1st step' \
-      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.CustomerDataCleanup; \
-      echo 'first step over' \
-      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.BrowserStackInit -PtestType=\"e2e\" executeE2ETests; \
-      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.MockDataCleanup ; \
 
+      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.CustomerDataCleanup; EX1=\"\$?\";\
+      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.BrowserStackInit -PtestType=\"e2e\" executeE2ETests; EX2=\"\$?\";\
+      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.MockDataCleanup ; EX3=\"\$?\";\
+      if [ $EX1 == 0 ] && [ $EX2 == 0 ] && [ $EX3 == 0 ]; then exit 0; else exit 1; fi; \
     \
     elif [ $FLAVOR = DEV ] ; then \
       ./gradlew clean \