diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat
index c357593003..827d940b29 100644
--- a/misc/jenkins/build_working_folder.bat
+++ b/misc/jenkins/build_working_folder.bat
@@ -1,3 +1,5 @@
+echo Packaging temp\%bundle_file% file
+
 set script_name=build_working_folder.bat
 echo Entering %script_name%
 
@@ -74,13 +76,12 @@ cd temp
 
 echo "Building bundle"
 pwd
-set zip_name=rusefi_bundle.zip
-zip -r %zip_name% *
+zip -r %bundle_file% *
 IF NOT ERRORLEVEL 0 echo %script_name%: ERROR INVOKING zip
 IF NOT ERRORLEVEL 0 EXIT /B 1
 
-echo %script_name%: Bundle %zip_name% ready
-ls -l %zip_name%
+echo %script_name%: Bundle %bundle_file% ready
+ls -l %bundle_file%
 cd ..
 echo "%script_name%: We are back in root directory"
 
diff --git a/misc/jenkins/compile_other_versions/prepare_bundle.bat b/misc/jenkins/compile_other_versions/prepare_bundle.bat
index 124df06d6e..8b7f5799c9 100644
--- a/misc/jenkins/compile_other_versions/prepare_bundle.bat
+++ b/misc/jenkins/compile_other_versions/prepare_bundle.bat
@@ -16,17 +16,14 @@ for /f %%i in ('datecyg +%%Y%%m%%d_%%H%%M%%S') do set TIMESTAMP=%%i
 set folder=snapshot_%TIMESTAMP%_%bundle_name%_rusefi
 set folder=temp\%folder%
 
-set bundle_file=rusefi_bundle_%bundle_name%.zip
+set bundle_full_name=rusefi_bundle_%bundle_name%
+set bundle_file=%bundle_full_name%.zip
 
-echo Packaging temp\rusefi_bundle.zip file
 call misc\jenkins\build_working_folder.bat
 
 cd temp
-mv rusefi_bundle.zip %bundle_file%
-
 echo Uploading %bundle_file%
 ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% . %bundle_file%
-
 cd ..
 
 pwd
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 9af942e24a..198ddf2176 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
@@ -80,7 +80,8 @@ set folder=temp\%folder%
 echo "%script_name%: folder variable3=%folder%"
 
 pwd
-set bundle_file=rusefi_bundle.zip
+set bundle_full_name=rusefi_bundle
+set bundle_file=%bundle_full_name%.zip
 call misc\jenkins\build_working_folder.bat
 IF NOT ERRORLEVEL 0 (
  echo %script_name%: ERROR: invoking build_working_folder.bat
@@ -102,7 +103,7 @@ cd %root_folder%
 pwd
 
 cd temp
-if not exist rusefi_bundle.zip echo %script_name%: ERROR not found rusefi_bundle.zip
+if not exist %bundle_file% echo %script_name%: ERROR not found rusefi_bundle.zip
 if not exist rusefi_bundle.zip EXIT /B 1
 echo "%script_name%: Uploading stuff"
 ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% . %bundle_file%