diff --git a/kernelci/kbuild.py b/kernelci/kbuild.py
index d90d39c77d..01a3061477 100644
--- a/kernelci/kbuild.py
+++ b/kernelci/kbuild.py
@@ -684,6 +684,8 @@ def _generate_script(self):
         self.startjob(None)
         # indicate script is ended
         self.addcmd("echo Build script is completed, tail will be killed now")
+        self.addcmd("stage=0")
+        self.disable_trap()
         # kill tail
         self.addcmd("kill $tailpid || true")
         print("Shell script generated")