diff --git a/config/dev.exs b/config/dev.exs
index 75bd50b4..dc81d64a 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -56,7 +56,9 @@ config :towerops, Oban,
     # Automatically delete completed jobs after 60 seconds
     {Oban.Plugins.Pruner, max_age: 60},
     # Rescue orphaned jobs (when node crashes)
-    {Oban.Plugins.Reindexer, schedule: "0 2 * * *"}
+    {Oban.Plugins.Reindexer, schedule: "0 2 * * *"},
+    # Rescue jobs stuck in executing state (mark as cancelled after 10 minutes)
+    {Oban.Plugins.Lifeline, rescue_after: to_timeout(minute: 10)}
   ]
 
 # Configure your database
diff --git a/config/runtime.exs b/config/runtime.exs
index 7f766d41..13a6c387 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -128,7 +128,9 @@ if config_env() == :prod do
       # Automatically delete completed jobs after 60 seconds
       {Oban.Plugins.Pruner, max_age: 60},
       # Rescue orphaned jobs (when node crashes)
-      {Oban.Plugins.Reindexer, schedule: "0 2 * * *"}
+      {Oban.Plugins.Reindexer, schedule: "0 2 * * *"},
+      # Rescue jobs stuck in executing state (mark as cancelled after 10 minutes)
+      {Oban.Plugins.Lifeline, rescue_after: to_timeout(minute: 10)}
     ]
 
   # ## SSL Support