diff --git a/src/api-service/__app__/onefuzzlib/agent_events.py b/src/api-service/__app__/onefuzzlib/agent_events.py
index 3f2a413f3..0f5fdab1b 100644
--- a/src/api-service/__app__/onefuzzlib/agent_events.py
+++ b/src/api-service/__app__/onefuzzlib/agent_events.py
@@ -173,7 +173,8 @@ def on_worker_event_running(
 
     if task.state in TaskState.shutting_down():
         logging.info(
-            "ignoring task start from node.  machine_id:%s %s:%s (state: %s)",
+            "ignoring task start from node. "
+            "machine_id:%s job_id:%s task_id:%s (state: %s)",
             machine_id,
             task.job_id,
             task.task_id,
@@ -182,7 +183,7 @@ def on_worker_event_running(
         return None
 
     logging.info(
-        "task started on node.  machine_id:%s %s:%s",
+        "task started on node.  machine_id:%s job_id%s task_id:%s",
         machine_id,
         task.job_id,
         task.task_id,
diff --git a/src/api-service/__app__/onefuzzlib/tasks/main.py b/src/api-service/__app__/onefuzzlib/tasks/main.py
index 2e28ac95a..75aa7f294 100644
--- a/src/api-service/__app__/onefuzzlib/tasks/main.py
+++ b/src/api-service/__app__/onefuzzlib/tasks/main.py
@@ -236,7 +236,9 @@ class Task(BASE_TASK, ORMMixin):
                     task.mark_failed(
                         Error(
                             code=ErrorCode.TASK_FAILED,
-                            errors=["prerequisite task failed"],
+                            errors=[
+                                "prerequisite task failed.  task_id:%s" % self.task_id
+                            ],
                         ),
                         tasks_in_job,
                     )
diff --git a/src/api-service/__app__/onefuzzlib/workers/nodes.py b/src/api-service/__app__/onefuzzlib/workers/nodes.py
index 7f26d60de..732b20aea 100644
--- a/src/api-service/__app__/onefuzzlib/workers/nodes.py
+++ b/src/api-service/__app__/onefuzzlib/workers/nodes.py
@@ -232,7 +232,10 @@ class Node(BASE_NODE, ORMMixin):
         if error is None:
             error = Error(
                 code=ErrorCode.TASK_FAILED,
-                errors=["node reimaged during task execution"],
+                errors=[
+                    "node reimaged during task execution.  machine_id:%s"
+                    % self.machine_id
+                ],
             )
 
         for entry in NodeTasks.get_by_machine_id(self.machine_id):
diff --git a/src/api-service/__app__/timer_tasks/__init__.py b/src/api-service/__app__/timer_tasks/__init__.py
index aa3f6bcc2..e98ad22ac 100644
--- a/src/api-service/__app__/timer_tasks/__init__.py
+++ b/src/api-service/__app__/timer_tasks/__init__.py
@@ -18,12 +18,14 @@ from ..onefuzzlib.tasks.scheduler import schedule_tasks
 def main(mytimer: func.TimerRequest, dashboard: func.Out[str]) -> None:  # noqa: F841
     expired_tasks = Task.search_expired()
     for task in expired_tasks:
-        logging.info("stopping expired task: %s", task.job_id)
+        logging.info(
+            "stopping expired task. job_id:%s task_id:%s", task.job_id, task.task_id
+        )
         task.mark_stopping()
 
     expired_jobs = Job.search_expired()
     for job in expired_jobs:
-        logging.info("stopping expired job: %s", job.job_id)
+        logging.info("stopping expired job. job_id:%s", job.job_id)
         job.stopping()
 
     jobs = Job.search_states(states=JobState.needs_work())
diff --git a/src/integration-tests/integration-test.py b/src/integration-tests/integration-test.py
index 1728b7bd8..77e9f500b 100755
--- a/src/integration-tests/integration-test.py
+++ b/src/integration-tests/integration-test.py
@@ -346,10 +346,11 @@ class TestOnefuzz:
         # check if the task itself has an error
         if task.error is not None:
             self.logger.error(
-                "task failed: %s - %s (%s)",
+                "task failed: %s - %s (%s) - %s",
                 job.config.name,
                 task.config.task.type.name,
                 task.error,
+                task.task_id,
             )
             return TaskTestState.failed