diff --git a/_lastrevision b/_lastrevision
index d7601ae..4baeeee 100644
--- a/_lastrevision
+++ b/_lastrevision
@@ -1 +1 @@
-1de50cc517e1ca25175eecfbdf87317aadb44d33
\ No newline at end of file
+af4efe8013e54de4be818761003c5966c88b6c19
\ No newline at end of file
diff --git a/enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch b/enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
new file mode 100644
index 0000000..4c4e3a3
--- /dev/null
+++ b/enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
@@ -0,0 +1,26 @@
+From 994ebca519945c86dc30f1510dff36b3261446c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
+ <psuarezhernandez@suse.com>
+Date: Thu, 10 Oct 2024 11:51:02 +0100
+Subject: [PATCH] Enhance cleanup mechanism after Salt Bundle upgrade
+ (bsc#1228690) (#685)
+
+---
+ pkg/common/venv-salt-minion-postinstall.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/common/venv-salt-minion-postinstall.service b/pkg/common/venv-salt-minion-postinstall.service
+index b122d7d6ea..c9db270435 100644
+--- a/pkg/common/venv-salt-minion-postinstall.service
++++ b/pkg/common/venv-salt-minion-postinstall.service
+@@ -2,6 +2,6 @@
+ Description=Clean old environment for venv-salt-minion
+ 
+ [Service]
+-ExecStart=/bin/sh -c '/usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :'
++ExecStart=/bin/sh -c 'WAIT_IF_SALT_JOBS=1 /usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :'
+ Type=oneshot
+ 
+-- 
+2.46.1
+
diff --git a/salt.changes b/salt.changes
index 3e3c379..eb34bad 100644
--- a/salt.changes
+++ b/salt.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 10 11:19:52 UTC 2024 - Pablo Suárez Hernández <psuarezhernandez@suse.com>
+
+- Make Salt Bundle more tolerant to long running jobs (bsc#1228690)
+
+- Added:
+  * enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
+
 -------------------------------------------------------------------
 Thu Oct  3 11:21:30 UTC 2024 - Marek Czernek <marek.czernek@suse.com>
 
diff --git a/salt.spec b/salt.spec
index 3363e1e..b93b560 100644
--- a/salt.spec
+++ b/salt.spec
@@ -450,6 +450,8 @@ Patch142:       avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch
 Patch143:       fix-x509-test-fails-on-old-openssl-systems-682.patch
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/684
 Patch144:       fix-x509-private-key-tests-and-test_suse-on-sle12-68.patch
+# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/685
+Patch145:       enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
 
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END