diff --git a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/pod.yaml
index 51008f05e..64a7d1b3f 100644
--- a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/pod.yaml
+++ b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/pod.yaml
@@ -9,4 +9,4 @@ spec:
     runAsGroup: 65534
   containers:
   - name: dummy
-    image: quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
\ No newline at end of file
+    image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
\ No newline at end of file
diff --git a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/testcases.json
index 847f6b042..cbe0a7f39 100644
--- a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/testcases.json
+++ b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/runas/testcases.json
@@ -258,7 +258,7 @@
                     "io.katacontainers.pkg.oci.container_type": "pod_container",
                     "io.kubernetes.cri.container-name": "dummy",
                     "io.kubernetes.cri.container-type": "container",
-                    "io.kubernetes.cri.image-name": "quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48",
+                    "io.kubernetes.cri.image-name": "quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48",
                     "io.kubernetes.cri.sandbox-id": "5cd5b1a9a4ccc5c9fcf9fcc66fb72bf01e0920a1f34ef505f744119db6679c41",
                     "io.kubernetes.cri.sandbox-name": "dummy",
                     "io.kubernetes.cri.sandbox-namespace": "kata-containers-k8s-tests",
diff --git a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/pod.yaml
index 387f1f897..0cbaf2606 100644
--- a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/pod.yaml
+++ b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/pod.yaml
@@ -12,4 +12,4 @@ spec:
       - 65532
   containers:
   - name: dummy
-    image: quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
\ No newline at end of file
+    image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
\ No newline at end of file
diff --git a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/testcases.json
index ae23a47ce..617e1028e 100644
--- a/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/testcases.json
+++ b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/supplemental_groups/testcases.json
@@ -10,7 +10,7 @@
                     "io.katacontainers.pkg.oci.container_type": "pod_container",
                     "io.kubernetes.cri.container-name": "dummy",
                     "io.kubernetes.cri.container-type": "container",
-                    "io.kubernetes.cri.image-name": "quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48",
+                    "io.kubernetes.cri.image-name": "quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48",
                     "io.kubernetes.cri.sandbox-id": "5cd5b1a9a4ccc5c9fcf9fcc66fb72bf01e0920a1f34ef505f744119db6679c41",
                     "io.kubernetes.cri.sandbox-name": "dummy",
                     "io.kubernetes.cri.sandbox-namespace": "kata-containers-k8s-tests",
@@ -344,7 +344,7 @@
                     "io.katacontainers.pkg.oci.container_type": "pod_container",
                     "io.kubernetes.cri.container-name": "dummy",
                     "io.kubernetes.cri.container-type": "container",
-                    "io.kubernetes.cri.image-name": "quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48",
+                    "io.kubernetes.cri.image-name": "quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48",
                     "io.kubernetes.cri.sandbox-id": "5cd5b1a9a4ccc5c9fcf9fcc66fb72bf01e0920a1f34ef505f744119db6679c41",
                     "io.kubernetes.cri.sandbox-name": "dummy",
                     "io.kubernetes.cri.sandbox-namespace": "kata-containers-k8s-tests",
diff --git a/tests/integration/kubernetes/runtimeclass_workloads/k8s-layered-sc-deployment.yaml b/tests/integration/kubernetes/runtimeclass_workloads/k8s-layered-sc-deployment.yaml
index c006678fd..4aa266a7b 100644
--- a/tests/integration/kubernetes/runtimeclass_workloads/k8s-layered-sc-deployment.yaml
+++ b/tests/integration/kubernetes/runtimeclass_workloads/k8s-layered-sc-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         runAsGroup: 2000
       containers:
       - name: master
-        image: quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
+        image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
         securityContext:
           runAsUser: 3000
         resources:
diff --git a/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-deployment.yaml b/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-deployment.yaml
index eff0d489a..3efc2d9b0 100644
--- a/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-deployment.yaml
+++ b/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         runAsGroup: 2000
       containers:
       - name: master
-        image: quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
+        image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
         resources:
           requests:
             cpu: 100m
diff --git a/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-nobodyupdate-deployment.yaml b/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-nobodyupdate-deployment.yaml
index d0051b29b..ddfdb0a50 100644
--- a/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-nobodyupdate-deployment.yaml
+++ b/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-nobodyupdate-deployment.yaml
@@ -29,7 +29,7 @@ spec:
         runAsUser: 65534
       containers:
       - name: master
-        image: quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
+        image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
         resources:
           requests:
             cpu: 100m
diff --git a/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-supplementalgroups-deployment.yaml b/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-supplementalgroups-deployment.yaml
index 885423f31..a1a6f6156 100644
--- a/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-supplementalgroups-deployment.yaml
+++ b/tests/integration/kubernetes/runtimeclass_workloads/k8s-pod-sc-supplementalgroups-deployment.yaml
@@ -34,7 +34,7 @@ spec:
           - 999
       containers:
       - name: master
-        image: quay.io/opstree/redis@sha256:2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
+        image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
         resources:
           requests:
             cpu: 100m
diff --git a/tests/integration/kubernetes/runtimeclass_workloads/k8s-policy-deployment.yaml b/tests/integration/kubernetes/runtimeclass_workloads/k8s-policy-deployment.yaml
index 6d3cb9468..363f676bf 100644
--- a/tests/integration/kubernetes/runtimeclass_workloads/k8s-policy-deployment.yaml
+++ b/tests/integration/kubernetes/runtimeclass_workloads/k8s-policy-deployment.yaml
@@ -29,7 +29,7 @@ spec:
         runAsUser: 1000
       containers:
       - name: master
-        image: quay.io/opstree/redis
+        image: quay.io/kata-containers/test-images/opstree/redis:sha256-2642c7b07713df6897fa88cbe6db85170690cf3650018ceb2ab16cfa0b4f8d48
         resources:
           requests:
             cpu: 100m