diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml
index d4ed3d3f2d933..d90f9cad31033 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml
@@ -772,7 +772,7 @@ tests:
     workflow: openshift-e2e-vsphere
 - always_run: false
   as: tls-pqc-readiness
-  optional: true
+  pipeline_skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$|^test/extended
   steps:
     cluster_profile: openshift-org-aws
     env:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml
index 45ac1e3f3906d..0e3822d1b4c67 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml
@@ -773,7 +773,7 @@ tests:
     workflow: openshift-e2e-vsphere
 - always_run: false
   as: tls-pqc-readiness
-  optional: true
+  pipeline_skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$|^test/extended
   steps:
     cluster_profile: openshift-org-aws
     env:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1.yaml
index 1047ed412620b..4229219d78d2e 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1.yaml
@@ -766,6 +766,19 @@ tests:
       DISK_SETUP: "true"
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-vsphere
+- always_run: false
+  as: tls-pqc-readiness
+  pipeline_skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$|^test/extended
+  steps:
+    cluster_profile: openshift-org-aws
+    env:
+      PQC_CHECK: "true"
+      SCAN_NAMESPACE: openshift-machine-config-operator
+      SCANNER_CPU: "2"
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: release-5.1
   org: openshift
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml
index 2706792639c6d..e59c8d318608f 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml
@@ -5486,6 +5486,8 @@ presubmits:
     trigger: (?m)^/test( | .* )security,?($|\s.*)
   - agent: kubernetes
     always_run: false
+    annotations:
+      pipeline_skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$|^test/extended
     branches:
     - ^main$
     - ^main-
@@ -5502,7 +5504,6 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-main-tls-pqc-readiness
-    optional: true
     rerun_command: /test tls-pqc-readiness
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml
index a8f29a99febab..e2afea3c83b64 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml
@@ -5460,6 +5460,8 @@ presubmits:
     trigger: (?m)^/test( | .* )security,?($|\s.*)
   - agent: kubernetes
     always_run: false
+    annotations:
+      pipeline_skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$|^test/extended
     branches:
     - ^release-5\.0$
     - ^release-5\.0-
@@ -5476,7 +5478,6 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-5.0-tls-pqc-readiness
-    optional: true
     rerun_command: /test tls-pqc-readiness
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1-presubmits.yaml
index 7e4c34f8b5cf0..c0f27bb459cd8 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1-presubmits.yaml
@@ -5339,6 +5339,92 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )security,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    annotations:
+      pipeline_skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$|^test/extended
+    branches:
+    - ^release-5\.1$
+    - ^release-5\.1-
+    cluster: build09
+    context: ci/prow/tls-pqc-readiness
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.rhel7
+    labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-machine-config-operator-release-5.1-tls-pqc-readiness
+    rerun_command: /test tls-pqc-readiness
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=tls-pqc-readiness
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )tls-pqc-readiness,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: