diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml
index a3c8d3f5563c2..fb98633f84974 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml
@@ -183,6 +183,29 @@ tests:
     test:
     - ref: tls-scanner-run
     workflow: openshift-e2e-aws-csi
+- always_run: false
+  as: tls-scanner-aws-efs
+  optional: true
+  steps:
+    cluster_profile: openshift-org-aws
+    dependencies:
+      OO_INDEX: ci-index-aws-efs-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: efs.csi.aws.com
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: aws-efs-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      SCAN_NAMESPACE: openshift-cluster-csi-drivers
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+      TRUECONDITIONS: AWSEFSDriverControllerServiceControllerAvailable AWSEFSDriverNodeServiceControllerAvailable
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: openshift-e2e-aws-csi-efs
 - as: aws-efs-operator-e2e
   steps:
     cluster_profile: openshift-org-aws
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.23.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.23.yaml
index 838135614e998..079db63de1ac2 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.23.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.23.yaml
@@ -183,6 +183,29 @@ tests:
     test:
     - ref: tls-scanner-run
     workflow: openshift-e2e-aws-csi
+- always_run: false
+  as: tls-scanner-aws-efs
+  optional: true
+  steps:
+    cluster_profile: openshift-org-aws
+    dependencies:
+      OO_INDEX: ci-index-aws-efs-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: efs.csi.aws.com
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: aws-efs-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      SCAN_NAMESPACE: openshift-cluster-csi-drivers
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+      TRUECONDITIONS: AWSEFSDriverControllerServiceControllerAvailable AWSEFSDriverNodeServiceControllerAvailable
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: openshift-e2e-aws-csi-efs
 - as: aws-efs-operator-e2e
   steps:
     cluster_profile: openshift-org-aws
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.0.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.0.yaml
index 919315a65c662..461cbf9150178 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.0.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.0.yaml
@@ -184,6 +184,29 @@ tests:
     test:
     - ref: tls-scanner-run
     workflow: openshift-e2e-aws-csi
+- always_run: false
+  as: tls-scanner-aws-efs
+  optional: true
+  steps:
+    cluster_profile: openshift-org-aws
+    dependencies:
+      OO_INDEX: ci-index-aws-efs-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: efs.csi.aws.com
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: aws-efs-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      SCAN_NAMESPACE: openshift-cluster-csi-drivers
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+      TRUECONDITIONS: AWSEFSDriverControllerServiceControllerAvailable AWSEFSDriverNodeServiceControllerAvailable
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: openshift-e2e-aws-csi-efs
 - as: aws-efs-operator-e2e
   steps:
     cluster_profile: openshift-org-aws
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.1.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.1.yaml
index 9db0f255e1aa5..d2c4176399607 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.1.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-5.1.yaml
@@ -183,6 +183,29 @@ tests:
     test:
     - ref: tls-scanner-run
     workflow: openshift-e2e-aws-csi
+- always_run: false
+  as: tls-scanner-aws-efs
+  optional: true
+  steps:
+    cluster_profile: openshift-org-aws
+    dependencies:
+      OO_INDEX: ci-index-aws-efs-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: efs.csi.aws.com
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: aws-efs-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      SCAN_NAMESPACE: openshift-cluster-csi-drivers
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+      TRUECONDITIONS: AWSEFSDriverControllerServiceControllerAvailable AWSEFSDriverNodeServiceControllerAvailable
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: openshift-e2e-aws-csi-efs
 - as: aws-efs-operator-e2e
   steps:
     cluster_profile: openshift-org-aws
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-main-presubmits.yaml
index b8963ca1e8327..66c210187e760 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-main-presubmits.yaml
@@ -4596,6 +4596,100 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )tls-scanner-aws-ebs,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build06
+    context: ci/prow/tls-scanner-aws-efs
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.aws-ebs
+      - Dockerfile.aws-efs
+      - Dockerfile.azure-disk
+      - Dockerfile.azure-file
+      - Dockerfile.create_efs
+      - Dockerfile.gcp-pd
+      - Dockerfile.openstack-cinder
+      - Dockerfile.openstack-manila
+      - Dockerfile.samba
+      - Dockerfile.test
+    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-csi-operator-main-tls-scanner-aws-efs
+    optional: true
+    rerun_command: /test tls-scanner-aws-efs
+    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-scanner-aws-efs
+        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-scanner-aws-efs,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.23-presubmits.yaml
index 5416184a6e14a..1e2bd70b9125d 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.23-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.23-presubmits.yaml
@@ -4559,6 +4559,100 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )tls-scanner-aws-ebs,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.23$
+    - ^release-4\.23-
+    cluster: build06
+    context: ci/prow/tls-scanner-aws-efs
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.aws-ebs
+      - Dockerfile.aws-efs
+      - Dockerfile.azure-disk
+      - Dockerfile.azure-file
+      - Dockerfile.create_efs
+      - Dockerfile.gcp-pd
+      - Dockerfile.openstack-cinder
+      - Dockerfile.openstack-manila
+      - Dockerfile.samba
+      - Dockerfile.test
+    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-csi-operator-release-4.23-tls-scanner-aws-efs
+    optional: true
+    rerun_command: /test tls-scanner-aws-efs
+    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-scanner-aws-efs
+        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-scanner-aws-efs,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.0-presubmits.yaml
index 9579c04140089..35dbc898d7c23 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.0-presubmits.yaml
@@ -4558,6 +4558,100 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )tls-scanner-aws-ebs,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-5\.0$
+    - ^release-5\.0-
+    cluster: build05
+    context: ci/prow/tls-scanner-aws-efs
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.aws-ebs
+      - Dockerfile.aws-efs
+      - Dockerfile.azure-disk
+      - Dockerfile.azure-file
+      - Dockerfile.create_efs
+      - Dockerfile.gcp-pd
+      - Dockerfile.openstack-cinder
+      - Dockerfile.openstack-manila
+      - Dockerfile.samba
+      - Dockerfile.test
+    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-csi-operator-release-5.0-tls-scanner-aws-efs
+    optional: true
+    rerun_command: /test tls-scanner-aws-efs
+    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-scanner-aws-efs
+        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-scanner-aws-efs,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.1-presubmits.yaml
index 59f71d424f839..8010b21db32d9 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-5.1-presubmits.yaml
@@ -4441,6 +4441,100 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )tls-scanner-aws-ebs,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-5\.1$
+    - ^release-5\.1-
+    cluster: build05
+    context: ci/prow/tls-scanner-aws-efs
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.aws-ebs
+      - Dockerfile.aws-efs
+      - Dockerfile.azure-disk
+      - Dockerfile.azure-file
+      - Dockerfile.create_efs
+      - Dockerfile.gcp-pd
+      - Dockerfile.openstack-cinder
+      - Dockerfile.openstack-manila
+      - Dockerfile.samba
+      - Dockerfile.test
+    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-csi-operator-release-5.1-tls-scanner-aws-efs
+    optional: true
+    rerun_command: /test tls-scanner-aws-efs
+    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-scanner-aws-efs
+        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-scanner-aws-efs,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: