diff --git a/src/worker.rs b/src/worker.rs
index a7737b7..2b2b4b2 100644
--- a/src/worker.rs
+++ b/src/worker.rs
@@ -109,7 +109,7 @@ impl Worker {
         match server.post_status(true, None).await {
             Ok(response) => response.run,
             Err(e) => {
-                warn!("Error requesting run:\n{e:?}");
+                warn!("Error requesting run from {}:\n{e:?}", server.name);
                 None
             }
         }
@@ -119,7 +119,7 @@ impl Worker {
         match server.post_status(false, Some(run)).await {
             Ok(_) => true,
             Err(e) => {
-                warn!("Error submitting run:\n{e:?}");
+                warn!("Error submitting run to {}:\n{e:?}", server.name);
                 false
             }
         }
diff --git a/src/worker/run.rs b/src/worker/run.rs
index b0d3e28..5f9916a 100644
--- a/src/worker/run.rs
+++ b/src/worker/run.rs
@@ -85,7 +85,7 @@ impl RunInProgress {
         let run = match result {
             Ok(outcome) => outcome,
             Err(e) => {
-                error!("Error during run:\n{e:?}");
+                error!("Error during run for {}:\n{e:?}", server.name);
                 self.log_stderr("Internal error:".to_string());
                 self.log_stderr(format!("{e:?}"));
                 Some(Finished {
diff --git a/src/worker/server.rs b/src/worker/server.rs
index 0d125d3..df4add6 100644
--- a/src/worker/server.rs
+++ b/src/worker/server.rs
@@ -122,7 +122,7 @@ impl Server {
     }
 
     async fn ping(&self) -> somehow::Result<()> {
-        debug!("Pinging server");
+        debug!("Pinging {}", self.name);
         let guard = self.status_lock.lock().await;
 
         let response = self.post_status(false, None).await?;
@@ -137,7 +137,7 @@ impl Server {
         loop {
             match self.ping().await {
                 Ok(()) => {}
-                Err(e) => warn!("Error talking to server:\n{e:?}"),
+                Err(e) => warn!("Error talking to {}:\n{e:?}", self.name),
             }
 
             tokio::time::sleep(self.config.ping).await;