diff --git a/agents/backport_agent.py b/agents/backport_agent.py
index 3e2bda5c0..2c98413ec 100644
--- a/agents/backport_agent.py
+++ b/agents/backport_agent.py
@@ -128,7 +128,8 @@ def get_prompt() -> str:
 
       {{.}}
 
-      Do your best to fix the issue and then generate a new SRPM.
+      Everything from the previous attempt has been reset. Start over, follow the instructions from the start
+      and don't forget to fix the issue.
       {{/build_error}}
     """
 
@@ -309,7 +310,7 @@ async def run_build_agent(state):
                     )
                     return "comment_in_jira"
                 state.build_error = build_result.error
-                return "run_backport_agent"
+                return "fork_and_prepare_dist_git"
 
             async def update_release(state):
                 try:
diff --git a/agents/rebase_agent.py b/agents/rebase_agent.py
index 7d859ce07..3b20d5f8a 100644
--- a/agents/rebase_agent.py
+++ b/agents/rebase_agent.py
@@ -131,7 +131,8 @@ def get_prompt() -> str:
 
       {{.}}
 
-      Do your best to fix the issue and then generate a new SRPM.
+      Everything from the previous attempt has been reset. Start over, follow the instructions from the start
+      and don't forget to fix the issue.
       {{/build_error}}
     """
 
@@ -280,7 +281,7 @@ async def run_build_agent(state):
                     )
                     return "comment_in_jira"
                 state.build_error = build_result.error
-                return "run_rebase_agent"
+                return "fork_and_prepare_dist_git"
 
             async def update_release(state):
                 try: