diff --git a/core/startos/src/manager/manager_seed.rs b/core/startos/src/manager/manager_seed.rs
index f90e7739f..35ebee409 100644
--- a/core/startos/src/manager/manager_seed.rs
+++ b/core/startos/src/manager/manager_seed.rs
@@ -29,7 +29,15 @@ impl ManagerSeed {
         )
         .await
         {
-            Err(e) if e.kind == ErrorKind::NotFound => (), // Already stopped
+            Err(e) if e.kind == ErrorKind::NotFound => {
+                tracing::info!(
+                    "Command for package {command_id} should already be stopped",
+                    command_id = &self.manifest.id
+                );
+            } // Already stopped
+            Err(e) if e.kind == ErrorKind::Timeout => {
+                tracing::warn!("Command for package {command_id} had to be timed out, but we have dropped which means it should be killed", command_id = &self.manifest.id);
+            } // Already stopped In theory
             a => a?,
         }
         Ok(())
diff --git a/core/startos/src/util/docker.rs b/core/startos/src/util/docker.rs
index fb6bc15f4..db6aa30c0 100644
--- a/core/startos/src/util/docker.rs
+++ b/core/startos/src/util/docker.rs
@@ -113,6 +113,7 @@ pub async fn stop_container(
     signal: Option<Signal>,
 ) -> Result<(), Error> {
     let mut cmd = Command::new(CONTAINER_TOOL);
+    let mut cmd = cmd.timeout(timeout);
     cmd.arg("stop");
     if let Some(dur) = timeout {
         cmd.arg("-t").arg(dur.as_secs().to_string());