diff --git a/.chainsaw.yaml b/.chainsaw.yaml
index 993fec47cd..c7829b087d 100755
--- a/.chainsaw.yaml
+++ b/.chainsaw.yaml
@@ -4,6 +4,7 @@ metadata:
   name: configuration
 spec:
   timeouts:
+    apply: 30s
     assert: 90s
     error: 90s
   parallel: 1
diff --git a/1 b/1
new file mode 100644
index 0000000000..b6f4e7b924
--- /dev/null
+++ b/1
@@ -0,0 +1,4 @@
+Go fmt...
+Go vet...
+Build cli binary...
+Fix CLI test files...
diff --git a/test/cli/test-mutate/karpenter-annotations-to-nodeselector/kyverno-test.yaml b/test/cli/test-mutate/karpenter-annotations-to-nodeselector/kyverno-test.yaml
index 241eadfaa2..6d88fcb8a4 100644
--- a/test/cli/test-mutate/karpenter-annotations-to-nodeselector/kyverno-test.yaml
+++ b/test/cli/test-mutate/karpenter-annotations-to-nodeselector/kyverno-test.yaml
@@ -7,12 +7,6 @@ policies:
 resources:
 - resource.yaml
 results:
-- kind: Pod
-  policy: karpenter-annotations-to-nodeselector
-  resources:
-  - soft-pod-antiaffinity-1-copy
-  result: pass
-  rule: hard-nodeselector-lifecycle-on-demand
 - kind: Pod
   patchedResources: patched.yaml
   policy: karpenter-annotations-to-nodeselector
@@ -20,3 +14,9 @@ results:
   - soft-pod-antiaffinity-1
   result: pass
   rule: hard-nodeselector-lifecycle-on-demand
+- kind: Pod
+  policy: karpenter-annotations-to-nodeselector
+  resources:
+  - soft-pod-antiaffinity-1-copy
+  result: pass
+  rule: hard-nodeselector-lifecycle-on-demand
diff --git a/test/cli/test-mutate/kyverno-test.yaml b/test/cli/test-mutate/kyverno-test.yaml
index fc70882001..df8be89492 100644
--- a/test/cli/test-mutate/kyverno-test.yaml
+++ b/test/cli/test-mutate/kyverno-test.yaml
@@ -14,6 +14,13 @@ results:
   - mydeploy
   result: pass
   rule: add-label
+- kind: Pod
+  patchedResources: patchedResource3.yaml
+  policy: add-label
+  resources:
+  - production/same-name-but-diff-namespace
+  result: pass
+  rule: add-label
 - kind: Pod
   patchedResources: patchedResource6.yaml
   policy: add-label
@@ -28,13 +35,6 @@ results:
   - testing/same-name-but-diff-namespace
   result: pass
   rule: add-label
-- kind: Pod
-  patchedResources: patchedResource3.yaml
-  policy: add-label
-  resources:
-  - production/same-name-but-diff-namespace
-  result: pass
-  rule: add-label
 - kind: Pod
   patchedResources: patchedResource1.yaml
   policy: add-label