diff --git a/other/label-nodes-cri/.chainsaw-test/chainsaw-test.yaml b/other/label-nodes-cri/.chainsaw-test/chainsaw-test.yaml
index fa8cac288..832c2217e 100755
--- a/other/label-nodes-cri/.chainsaw-test/chainsaw-test.yaml
+++ b/other/label-nodes-cri/.chainsaw-test/chainsaw-test.yaml
@@ -14,7 +14,7 @@ spec:
     try:
     - script:
         content: |
-          kubectl get configmap kyverno -n kyverno -o yaml | sed 's/\[Node\/\*,\*,\*\]//g' - | sed 's/\[Node,\*,\*\]//g' - | kubectl apply -f -
+          kubectl get configmap kyverno -n kyverno -o yaml | sed 's/\[Node\/\*,\*,\*\]//g' | sed 's/\[Node,\*,\*\]//g' | kubectl apply -f -
     - sleep:
         duration: 5s
   - name: step-02
@@ -33,7 +33,7 @@ spec:
     try:
     - script:
         content: |
-          kubectl get configmap -n kyverno kyverno -o yaml | sed 's/\[APIService,\*,\*\]/\[Node,\*,\*\] \[Node\/\*,\*,\*\] \[APIService,\*,\*\]/g' - | kubectl apply -f -
+          kubectl get configmap -n kyverno kyverno -o yaml | sed 's/\[APIService,\*,\*\]/\[Node,\*,\*\] \[Node\/\*,\*,\*\] \[APIService,\*,\*\]/g' | kubectl apply -f -
     - script:
         content: |
           node=$(kubectl get nodes --no-headers | awk '{print $1}' | head -n 1);
diff --git a/other/replace-image-registry/.chainsaw-test/pods.yaml b/other/replace-image-registry/.chainsaw-test/pods.yaml
index cc4ea8785..431e2298a 100644
--- a/other/replace-image-registry/.chainsaw-test/pods.yaml
+++ b/other/replace-image-registry/.chainsaw-test/pods.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   containers:
   - name: busybox
-    image: ghcr.io/kyverno/test-busybox:1.35
+    image: ghcr.io/busybox:1.35
   - name: busybox02
     image: docker.io/busybox:1.35
 ---
diff --git a/other/require-imagepullsecrets/.chainsaw-test/pod-bad.yaml b/other/require-imagepullsecrets/.chainsaw-test/pod-bad.yaml
index 7db3ce839..90485653d 100644
--- a/other/require-imagepullsecrets/.chainsaw-test/pod-bad.yaml
+++ b/other/require-imagepullsecrets/.chainsaw-test/pod-bad.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: busybox
-    image: ghcr.io/kyverno/test-busybox:1.35
+    image: busybox
 ---
 apiVersion: v1
 kind: Pod
@@ -13,10 +13,10 @@ metadata:
   name: badpod02
 spec:
   containers:
-  - name: nginx
+  - name: test
     image: ghcr.io/kyverno/test-verify-image:unsigned
   - name: busybox
-    image: ghcr.io/kyverno/test-busybox:1.35
+    image: docker.io/library/busybox:latest
 ---
 apiVersion: v1
 kind: Pod
@@ -25,9 +25,9 @@ metadata:
 spec:
   containers:
   - name: busybox
-    image: ghcr.io/kyverno/test-busybox:1.35
+    image: docker.io/library/busybox:latest
   - name: nginx
-    image: ghcr.io/kyverno/test-verify-image:unsigned
+    image: test
 ---
 apiVersion: v1
 kind: Pod
diff --git a/other/require-imagepullsecrets/.chainsaw-test/podcontroller-bad.yaml b/other/require-imagepullsecrets/.chainsaw-test/podcontroller-bad.yaml
index 3b35ab9e8..6d54ff516 100644
--- a/other/require-imagepullsecrets/.chainsaw-test/podcontroller-bad.yaml
+++ b/other/require-imagepullsecrets/.chainsaw-test/podcontroller-bad.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: busybox
-        image: ghcr.io/kyverno/test-busybox:1.35
+        image: docker.io/library/busybox:latest
       - name: nginx
         image: ghcr.io/kyverno/test-verify-image:unsigned
 ---
@@ -33,7 +33,7 @@ spec:
         spec:
           containers:
           - name: nginx
-            image: ghcr.io/kyverno/test-verify-image:unsigned
+            image: docker.io/library/busybox:latest
           - name: busybox
             image: ghcr.io/kyverno/test-busybox:1.35
           restartPolicy: OnFailure
\ No newline at end of file
diff --git a/other/resolve-image-to-digest/.chainsaw-test/podcontroller-patched.yaml b/other/resolve-image-to-digest/.chainsaw-test/podcontroller-patched.yaml
index 30cd5da24..beb41ff21 100644
--- a/other/resolve-image-to-digest/.chainsaw-test/podcontroller-patched.yaml
+++ b/other/resolve-image-to-digest/.chainsaw-test/podcontroller-patched.yaml
@@ -17,9 +17,9 @@ spec:
     spec:
       containers:
       - name: busybox
-        image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+        image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3
       - name: busybox02
-        image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+        image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3
 ---
 apiVersion: batch/v1
 kind: CronJob
@@ -33,7 +33,7 @@ spec:
         spec:
           containers:
           - name: busybox
-            image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+            image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3
           - name: busybox02
-            image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+            image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3
           restartPolicy: OnFailure
\ No newline at end of file
diff --git a/other/resolve-image-to-digest/.chainsaw-test/pods-patched.yaml b/other/resolve-image-to-digest/.chainsaw-test/pods-patched.yaml
index 1d4567cdf..e9ddd787f 100644
--- a/other/resolve-image-to-digest/.chainsaw-test/pods-patched.yaml
+++ b/other/resolve-image-to-digest/.chainsaw-test/pods-patched.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: busybox
-    image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+    image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3
 ---
 apiVersion: v1
 kind: Pod
@@ -14,6 +14,6 @@ metadata:
 spec:
   containers:
   - name: busybox
-    image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+    image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3
   - name: busybox02
-    image: index.docker.io/library/busybox@sha256:141c253bc4c3fd0a201d32dc1f493bcf3fff003b6df416dea4f41046e0f37d47
+    image: ghcr.io/kyverno/test-busybox@sha256:859d41e4316c182cb559f9ae3c5ffcac8602ee1179794a1707c06cd092a008d3