diff --git a/.chainsaw.yaml b/.chainsaw.yaml
index 95c2827265..d5afb9f657 100755
--- a/.chainsaw.yaml
+++ b/.chainsaw.yaml
@@ -10,3 +10,4 @@ spec:
     assert: 6m40s
     cleanup: 6m40s
     error: 6m40s
+    exec: 6m40s
diff --git a/test/chainsaw/testcertificate/cert-recreates/00-assert.yaml b/test/chainsaw/testcertificate/cert-recreates/00-assert.yaml
index 05a31f9cd5..4f8a5d1374 100644
--- a/test/chainsaw/testcertificate/cert-recreates/00-assert.yaml
+++ b/test/chainsaw/testcertificate/cert-recreates/00-assert.yaml
@@ -22,3 +22,21 @@ metadata:
     control-plane: lifecycle-operator
 status:
   readyReplicas: 1
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: keptn-system
+  labels:
+    control-plane: lifecycle-operator
+status:
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: keptn-system
+  labels:
+    control-plane: metrics-operator
+status:
+  phase: Running
diff --git a/test/chainsaw/testcertificate/cert-recreates/01-assert.yaml b/test/chainsaw/testcertificate/cert-recreates/01-assert.yaml
index 05a31f9cd5..4f8a5d1374 100644
--- a/test/chainsaw/testcertificate/cert-recreates/01-assert.yaml
+++ b/test/chainsaw/testcertificate/cert-recreates/01-assert.yaml
@@ -22,3 +22,21 @@ metadata:
     control-plane: lifecycle-operator
 status:
   readyReplicas: 1
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: keptn-system
+  labels:
+    control-plane: lifecycle-operator
+status:
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: keptn-system
+  labels:
+    control-plane: metrics-operator
+status:
+  phase: Running
diff --git a/test/chainsaw/testcertificate/cert-recreates/02-assert.yaml b/test/chainsaw/testcertificate/cert-recreates/02-assert.yaml
index 19f43f6912..1ffdaf9b05 100644
--- a/test/chainsaw/testcertificate/cert-recreates/02-assert.yaml
+++ b/test/chainsaw/testcertificate/cert-recreates/02-assert.yaml
@@ -24,3 +24,21 @@ metadata:
   namespace: keptn-system
 status:
   readyReplicas: 1
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: keptn-system
+  labels:
+    control-plane: lifecycle-operator
+status:
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: keptn-system
+  labels:
+    control-plane: metrics-operator
+status:
+  phase: Running