diff --git a/Dockerfile b/Dockerfile
index cda3884171..194f17b4c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,12 +33,18 @@ WORKDIR $WORK_DIR
 
 RUN echo ${RELEASE_STORE_FILE} | base64 -d >> app/navi-release-key.jks
 
-RUN bash -c " if [ $FLAVOR = E2ETEST ] ; then ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.CustomerDataCleanup; fi ;"
-RUN bash -c " if [ $FLAVOR = E2ETEST ] ; then ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.BrowserStackInit -PtestType=\"e2e\" executeE2ETests; fi ;"
-RUN bash -c " if [ $FLAVOR = E2ETEST ] ; then ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.MockDataCleanup; fi ;"
-
 RUN bash -c " \
-    if [ $FLAVOR = DEV ] ; then \
+
+    if [ $FLAVOR = E2ETEST ] ; then \
+      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.CustomerDataCleanup; \
+      status=$? \
+      if [ $status -ne 0 ]; then \
+          echo "Failed while cleaning data: $status" \
+      fi \
+      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.BrowserStackInit -PtestType=\"e2e\" executeE2ETests; \
+      ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.MockDataCleanup; \
+    \
+    elif [ $FLAVOR = DEV ] ; then \
       ./gradlew clean \
       assembleDev -PFLAVOR=${FLAVOR} -PRELEASE_STORE_PASSWORD=${RELEASE_STORE_PASSWORD} -PRELEASE_KEY_PASSWORD=${RELEASE_KEY_PASSWORD} -PRELEASE_KEY_ALIAS=${RELEASE_KEY_ALIAS} ; \
     \
@@ -52,5 +58,4 @@ RUN bash -c " \
     \
     else echo 'ERROR: Flavor not mentioned' ; \
     fi ;"
-
 RUN bash -c "if [ $FLAVOR !=  E2ETEST ] ; then ./gradlew uploadArchives -PFLAVOR=${FLAVOR} -PNEXUS_URL=${NEXUS_URL} -PNEXUS_USERNAME=${NEXUS_USERNAME} -PNEXUS_PASSWORD=${NEXUS_PASSWORD} ; fi ;"
\ No newline at end of file