diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
index f64475730..8df0d7d84 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
+++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
@@ -49,6 +49,7 @@
 import org.opendc.compute.simulator.host.HostState;
 import org.opendc.compute.simulator.host.SimHost;
 import org.opendc.compute.simulator.scheduler.ComputeScheduler;
+import org.opendc.compute.simulator.telemetry.ComputeMetricReader;
 import org.opendc.compute.simulator.telemetry.SchedulerStats;
 import org.opendc.simulator.compute.power.SimPowerSource;
 import org.opendc.simulator.compute.workload.Workload;
@@ -141,6 +142,8 @@ public final class ComputeService implements AutoCloseable {
 
     private final List<ServiceTask> tasksToRemove = new ArrayList<>();
 
+    private ComputeMetricReader metricReader;
+
     /**
      * A [HostListener] used to track the active tasks.
      */
@@ -201,7 +204,7 @@ public void onStateChanged(@NotNull SimHost host, @NotNull ServiceTask task, @No
                 }
 
                 if (task.getState() == TaskState.COMPLETED || task.getState() == TaskState.TERMINATED) {
-                    tasksToRemove.add(task);
+                    setTaskToBeRemoved(task);
                 }
 
                 // Try to reschedule if needed
@@ -214,11 +217,12 @@ public void onStateChanged(@NotNull SimHost host, @NotNull ServiceTask task, @No
     private long maxMemory = 0L;
     private long attemptsSuccess = 0L;
     private long attemptsFailure = 0L;
-    private int tasksTotal = 0;
-    private int tasksPending = 0;
-    private int tasksActive = 0;
-    private int tasksTerminated = 0;
-    private int tasksCompleted = 0;
+    private int tasksExpected = 0; // Number of tasks expected from the input trace
+    private int tasksTotal = 0; // Number of tasks seen by the service
+    private int tasksPending = 0; // Number of tasks waiting to be scheduled
+    private int tasksActive = 0; // Number of tasks that are currently running
+    private int tasksTerminated = 0; // Number of tasks that were terminated due to too much failures
+    private int tasksCompleted = 0; // Number of tasks completed successfully
 
     /**
      * Construct a {@link ComputeService} instance.
@@ -332,6 +336,21 @@ public Set<SimPowerSource> getPowerSources() {
         return Collections.unmodifiableSet(this.powerSources);
     }
 
+    public void setMetricReader(ComputeMetricReader metricReader) {
+        this.metricReader = metricReader;
+    }
+
+    public void setTasksExpected(int numberOfTasks) {
+        this.tasksExpected = numberOfTasks;
+    }
+
+    public void setTaskToBeRemoved(ServiceTask task) {
+        this.tasksToRemove.add(task);
+        if ((tasksTerminated + tasksCompleted) == tasksExpected) {
+            metricReader.loggState(); // Logg the state for the final time. This will also delete all remaining tasks.
+        }
+    }
+
     /**
      * Collect the statistics about the scheduler component of this service.
      */
@@ -426,7 +445,8 @@ private void doSchedule() {
                 tasksPending--;
                 tasksTerminated++;
                 task.setState(TaskState.TERMINATED);
-                tasksToRemove.add(task);
+
+                this.setTaskToBeRemoved(task);
                 continue;
             }
 
diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/ComputeMonitorProvisioningStep.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/ComputeMonitorProvisioningStep.kt
index f295f522c..da6dcfbcc 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/ComputeMonitorProvisioningStep.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/ComputeMonitorProvisioningStep.kt
@@ -53,6 +53,6 @@ public class ComputeMonitorProvisioningStep(
                 startTime,
                 carbonTrace,
             )
-        return AutoCloseable { metricReader.close() }
+        return metricReader
     }
 }
diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/Provisioner.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/Provisioner.kt
index 2e76478e3..d06dac06e 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/Provisioner.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/provisioner/Provisioner.kt
@@ -24,6 +24,7 @@ package org.opendc.compute.simulator.provisioner
 
 import org.opendc.common.Dispatcher
 import org.opendc.compute.simulator.ServiceRegistry
+import org.opendc.compute.simulator.telemetry.ComputeMetricReader
 import java.util.ArrayDeque
 import java.util.SplittableRandom
 
@@ -61,6 +62,16 @@ public class Provisioner(dispatcher: Dispatcher, seed: Long) : AutoCloseable {
     public val registry: ServiceRegistry
         get() = context.registry
 
+    public fun getMonitor(): ComputeMetricReader? {
+        for (element in stack) {
+            if (element is ComputeMetricReader) {
+                return element
+            }
+        }
+
+        return null
+    }
+
     /**
      * Run a single [ProvisioningStep] for this environment.
      *
diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/ComputeMetricReader.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/ComputeMetricReader.kt
index fb7c8f895..3098ed55e 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/ComputeMetricReader.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/telemetry/ComputeMetricReader.kt
@@ -108,7 +108,7 @@ public class ComputeMetricReader(
             }
         }
 
-    private fun loggState() {
+    public fun loggState() {
         loggCounter++
         try {
             val now = this.clock.instant()
diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
index df5aabf72..d803fd7e8 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
@@ -109,7 +109,11 @@ public fun runScenario(
             val startTime = Duration.ofMillis(tasks.minOf { it.submissionTime }.toEpochMilli())
             addExportModel(provisioner, serviceDomain, scenario, seed, startTime, carbonTrace, scenario.id)
 
+            val monitor = provisioner.getMonitor()
+
             val service = provisioner.registry.resolve(serviceDomain, ComputeService::class.java)!!
+            service.setMetricReader(monitor)
+            service.setTasksExpected(tasks.size)
             service.replay(
                 timeSource,
                 tasks,