diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index 95ac05a..e6c9655 100644
--- a/devbox/cli/devbox
+++ b/devbox/cli/devbox
@@ -914,6 +914,10 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
       echo
       echo "============================================"
       echo
+
+      # rm baseline_backend
+      rm -f "\$baseline_backend"
+
       exit 1
   fi
 
@@ -934,6 +938,8 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
       echo
       echo "============================================"
       echo
+      rm -f "\$baseline_backend"
+
       exit 1
   fi
   
@@ -1165,11 +1171,6 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   git config --global --add safe.directory /home/devbox/freeleaps
   git status -s > "\$baseline_frontend"
 
-  # save baseline to /home/devbox/tmp/baseline_frontend
-  mkdir -p /home/devbox/tmp
-  cp "\$baseline_frontend" /home/devbox/tmp/baseline_frontend.bak
-  
-
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Recorded baseline before compilation: \$baseline_frontend"
 
   # Check if the frontend service is already running according to the package.json and pnpm-lock.yaml files timestamps
@@ -1201,6 +1202,11 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
           mv pnpm-lock.yaml /tmp/pnpm-lock.yaml.bak
       fi
 
+      # if /home/devbox/.pnpm-store exists, remove it
+      if [ -d "/home/devbox/.pnpm-store" ]; then
+          rm -rf /home/devbox/.pnpm-store
+      fi
+
       # Install dependencies
       pnpm install --no-frozen-lockfile \\
              --shamefully-hoist \\
@@ -1213,6 +1219,11 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
           echo
           echo "============================================================================================"
           echo
+
+          # rm baseline_frontend if it exists
+          if [ -f "\$baseline_frontend" ]; then
+              rm "\$baseline_frontend"
+          fi
           exit 1
       }
   fi
@@ -1228,6 +1239,10 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
           echo
           echo "============================================================================================"
           echo
+
+          if [ -f "\$baseline_frontend" ]; then
+              rm "\$baseline_frontend"
+          fi
           exit 1
       }
 
@@ -1240,6 +1255,10 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
           echo
           echo "============================================================================================"
           echo
+
+          if [ -f "\$baseline_frontend" ]; then
+              rm "\$baseline_frontend"
+          fi
           exit 1
       fi
   fi
@@ -1277,18 +1296,7 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
       sleep 10
     fi
   done
-  if [ \$ATTEMPT -eq \$MAX_ATTEMPTS ]; then
-    echo 
-    echo "============================================================================================"
-    echo 
-    echo "[FRONTEND] [ERROR] Frontend service startup failed. Please check the logs for more information. Logs: ${WORKING_HOME}/logs/frontend.logs"
-    echo 
-    echo "============================================================================================"
-    echo
-    
-    exit 1
-  fi
-
+  
   # if /tmp/pnpm-lock.yaml.bak exists, restore it
   if [ -f "/tmp/pnpm-lock.yaml.bak" ]; 
   then
@@ -1316,6 +1324,17 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
 
   popd > /dev/null
 
+  if [ \$ATTEMPT -eq \$MAX_ATTEMPTS ]; then
+    echo 
+    echo "============================================================================================"
+    echo 
+    echo "[FRONTEND] [ERROR] Frontend service startup failed. Please check the logs for more information. Logs: ${WORKING_HOME}/logs/frontend.logs"
+    echo 
+    echo "============================================================================================"
+    echo
+    exit 1
+  fi
+
   echo
   echo "[FRONTEND]  \$(date '+%Y-%m-%d %H:%M:%S') Frontend compilation and startup completed."
   echo