diff --git a/Makefile b/Makefile
index b9773db..87975c2 100644
--- a/Makefile
+++ b/Makefile
@@ -347,7 +347,7 @@ chainsaw-setup: ## Run the chainsaw setup
 .PHONY: chainsaw-test
 chainsaw-test: chainsaw ## Run the chainsaw test
 	- KUBECONFIG=$(KIND_KUBECONFIG) $(CHAINSAW) test --cluster cluster-1=$(KIND_KUBECONFIG) --test-dir ./test/e2e/tls
-	KUBECONFIG=$(KIND_KUBECONFIG) kubectl logs -n secret-operator-system -l "app.kubernetes.io/name=secret-operator"
+	KUBECONFIG=$(KIND_KUBECONFIG) kubectl logs --tail=-1 -n secret-operator-system -l "app.kubernetes.io/name=secret-operator"
 
 .PHONY: chainsaw-cleanup
 chainsaw-cleanup: ## Run the chainsaw cleanup
diff --git a/test/e2e/krb5/chainsaw-test.yaml b/test/e2e/krb5/chainsaw-test.yaml
index 079c2f1..5c73291 100644
--- a/test/e2e/krb5/chainsaw-test.yaml
+++ b/test/e2e/krb5/chainsaw-test.yaml
@@ -89,14 +89,14 @@ spec:
         file: node-scope.yaml
     - assert:
         file: node-scope-assert.yaml
-  - catch:
-    - script:
-        env:
-          - name: NAMESPACE
-            value: ($namespace)
-        content: |
-          kubectl -n "$NAMESPACE" get pod
-          kubectl -n "$NAMESPACE" describe pod
+    catch:
+      - script:
+          env:
+            - name: NAMESPACE
+              value: ($namespace)
+          content: |
+            kubectl -n "$NAMESPACE" get pod
+            kubectl -n "$NAMESPACE" describe pod
   - try:
     - apply:
         file: service-scope.yaml
diff --git a/test/e2e/tls/chainsaw-test.yaml b/test/e2e/tls/chainsaw-test.yaml
index 9bb7f4c..46e55f9 100644
--- a/test/e2e/tls/chainsaw-test.yaml
+++ b/test/e2e/tls/chainsaw-test.yaml
@@ -15,15 +15,14 @@ spec:
           file: tls-scope.yaml
       - assert:
           file: tls-scope-assert.yaml
-    - catch:
-      - script:
-          env:
-            - name: NAMESPACE
-              value: ($namespace)
-          content: |
-            kubectl -n "$NAMESPACE" get pod
-            kubectl -n "$NAMESPACE" describe pod
-
+      catch:
+        - script:
+            env:
+              - name: NAMESPACE
+                value: ($namespace)
+            content: |
+              kubectl -n "$NAMESPACE" get pod
+              kubectl -n "$NAMESPACE" describe pod
     # tls will expires case
     - try:
       - apply: