diff --git a/hive-c0re/src/job_queue/exec.rs b/hive-c0re/src/job_queue/exec.rs
index 311d1ce1..5208a43f 100644
--- a/hive-c0re/src/job_queue/exec.rs
+++ b/hive-c0re/src/job_queue/exec.rs
@@ -429,9 +429,15 @@ async fn run_stop(coord: &Arc<Coordinator>, name: &str) -> Result<()> {
     // own kind now.
     crate::lifecycle::kill(name).await?;
     coord.unregister_agent(name);
-    coord.notify_manager(&hive_sh4re::HelperEvent::Killed {
-        agent: name.to_owned(),
-    });
+    coord
+        .push_todo(
+            hive_sh4re::MANAGER_AGENT,
+            "core",
+            Some(format!("killed:{name}")),
+            format!("agent '{name}' killed"),
+            None,
+        )
+        .await;
     coord.rescan_containers_and_emit().await;
     Ok(())
 }
diff --git a/hive-c0re/src/socket_server/lifecycle_handlers.rs b/hive-c0re/src/socket_server/lifecycle_handlers.rs
index 92a9312f..0b7449ad 100644
--- a/hive-c0re/src/socket_server/lifecycle_handlers.rs
+++ b/hive-c0re/src/socket_server/lifecycle_handlers.rs
@@ -129,9 +129,15 @@ pub(super) async fn handle_kill(coord: &Arc<Coordinator>, agent: &str, name: &st
     .await;
     match result {
         Ok(()) => {
-            coord.notify_manager(&hive_sh4re::HelperEvent::Killed {
-                agent: name.to_owned(),
-            });
+            coord
+                .push_todo(
+                    hive_sh4re::MANAGER_AGENT,
+                    "core",
+                    Some(format!("killed:{name}")),
+                    format!("agent '{name}' killed"),
+                    None,
+                )
+                .await;
             Response::Ok
         }
         Err(e) => Response::Err {