diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
index f171646695..098d2be101 100644
--- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
+++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
@@ -19,7 +19,10 @@ if not exist flash_erase407.bat echo NOT FOUND flash_erase.bat
 if not exist flash_erase407.bat exit -1
 echo build_current_bundle.bat: Erasing chip
 pwd
+rem Using magic 'cd' system variable here
+set "cur_folder=%cd%"
 call flash_erase407.bat
+cd %cur_folder%
 pwd
 
 
diff --git a/misc/jenkins/functional_test_and_build_bundle/hw_test.bat b/misc/jenkins/functional_test_and_build_bundle/hw_test.bat
index 0b721eb43b..1cc9e184f2 100644
--- a/misc/jenkins/functional_test_and_build_bundle/hw_test.bat
+++ b/misc/jenkins/functional_test_and_build_bundle/hw_test.bat
@@ -2,10 +2,14 @@ echo I am hw_test.bat
 pwd
 
 cd firmware
+rem Using magic 'cd' system variable here
+set "cur_folder=%cd%"
 call flash_erase407.bat
 rem This script depends on someone else building firmware
 call flash_openocd407.bat
 
+cd %cur_folder%
+
 if not exist build/rusefi.bin echo FIRMWARE NOT FOUND
 if not exist build/rusefi.bin exit -1