diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 5aad075c2cb..2a95ba98cb9 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -30,16 +30,15 @@ pushd /cuttlefish
 # Add a function to perform some tasks when exiting the script
 function my_atexit()
 {
+  # shellcheck disable=SC2317
+  HOME=/cuttlefish stop_cvd -wait_for_launcher=10
+
   # shellcheck disable=SC2317
   cp /cuttlefish/cuttlefish/instances/cvd-1/logs/logcat $RESULTS_DIR || true
   # shellcheck disable=SC2317
   cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log $RESULTS_DIR || true
-
   # shellcheck disable=SC2317
   cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR || true
-
-  # shellcheck disable=SC2317
-  HOME=/cuttlefish stop_cvd -wait_for_launcher=10
 }
 
 # stop cuttlefish if the script ends prematurely or is interrupted