diff --git a/pkg/runner/job_executor.go b/pkg/runner/job_executor.go
index 0c8cdb4..79d9399 100644
--- a/pkg/runner/job_executor.go
+++ b/pkg/runner/job_executor.go
@@ -53,15 +53,14 @@ func newJobExecutor(info jobInfo) common.Executor {
 	}
 
 	steps = append(steps, func(ctx context.Context) error {
-		err := info.stopContainer()(ctx)
-		if err != nil {
-			return err
-		}
-
 		jobError := common.JobError(ctx)
 		if jobError != nil {
 			info.result("failure")
 		} else {
+			err := info.stopContainer()(ctx)
+			if err != nil {
+				return err
+			}
 			info.result("success")
 		}
 
diff --git a/pkg/runner/job_executor_test.go b/pkg/runner/job_executor_test.go
index e22bc82..8417308 100644
--- a/pkg/runner/job_executor_test.go
+++ b/pkg/runner/job_executor_test.go
@@ -103,7 +103,6 @@ func TestNewJobExecutor(t *testing.T) {
 			executedSteps: []string{
 				"startContainer",
 				"step1",
-				"stopContainer",
 				"interpolateOutputs",
 				"closeContainer",
 			},