diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.20.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.20.yaml
index facb672db5463..401ba48da43b0 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.20.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.20.yaml
@@ -77,6 +77,7 @@ tests:
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.15", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_VERSION: "3.16"
       TEST_IMPORTANCE: LEVEL0
       TEST_SCENARIOS: Cluster_Observability
       ZONES_COUNT: "3"
@@ -104,7 +105,7 @@ tests:
     - ref: acm-tests-clc-create
     - ref: acm-fetch-managed-clusters
     - ref: interop-tests-ocs-tests
-    - ref: quay-tests-quay-interop-test
+    - ref: quay-tests-test-quay-e2e
     - ref: acm-opp-app
     - ref: acm-tests-observability
     - ref: acm-tests-grc
diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.21.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.21.yaml
index d473b572e0c77..c61429e82702b 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.21.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.21.yaml
@@ -81,6 +81,7 @@ tests:
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.15", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_VERSION: "3.16"
       TEST_IMPORTANCE: LEVEL0
       TEST_SCENARIOS: Cluster_Observability
       ZONES_COUNT: "3"
@@ -108,7 +109,7 @@ tests:
     - ref: acm-tests-clc-create
     - ref: acm-fetch-managed-clusters
     - ref: interop-tests-ocs-tests
-    - ref: quay-tests-quay-interop-test
+    - ref: quay-tests-test-quay-e2e
     - ref: acm-opp-app
     - ref: acm-tests-observability
     - ref: acm-tests-grc