diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml
index 1067df97a6b75..21a278b5e627e 100644
--- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml
@@ -3,6 +3,10 @@ base_images:
     name: tests-private
     namespace: ci
     tag: "4.22"
+  tls-scanner-tool:
+    name: tls-scanner
+    namespace: tls-scanner
+    tag: tls-scanner-tool
 binary_build_commands: make build
 build_root:
   from_repository: true
@@ -54,6 +58,14 @@ tests:
   skip_if_only_changed: ^docs/|^\.tekton/|^rpms\.(.*)\.yaml$|^renovate.json$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openshift-org-aws
+    env:
+      PQC_CHECK: "true"
+      SCAN_NAMESPACE: openshift-machine-api
+      SCANNER_CPU: 500m
+      SCANNER_MEMORY: 1Gi
+    test:
+    - ref: openshift-e2e-test
+    - ref: tls-scanner-run
     workflow: openshift-e2e-aws
 - as: e2e-aws-operator
   skip_if_only_changed: ^docs/|^\.tekton/|^rpms\.(.*)\.yaml$|^renovate.json$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$
diff --git a/ci-operator/step-registry/cluster-profiles/cluster-profiles-config.yaml b/ci-operator/step-registry/cluster-profiles/cluster-profiles-config.yaml
index 40f36ec6de957..85d43590c3ad8 100644
--- a/ci-operator/step-registry/cluster-profiles/cluster-profiles-config.yaml
+++ b/ci-operator/step-registry/cluster-profiles/cluster-profiles-config.yaml
@@ -1869,9 +1869,6 @@ cluster_profiles:
   secret: cluster-secrets-vsphere
 konflux:
   cluster_groups:
-    rh-stg:
-    - stone-stg-rh01
-    - stone-stage-p01
     rh-prod:
     - kflux-ocp-p01
     - kflux-osp-p01
@@ -1881,3 +1878,6 @@ konflux:
     - stone-prd-rh01
     - stone-prod-p01
     - stone-prod-p02
+    rh-stg:
+    - stone-stg-rh01
+    - stone-stage-p01