diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml
deleted file mode 100644
index 89e6a519fc943..0000000000000
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml
+++ /dev/null
@@ -1,367 +0,0 @@
-base_images:
-  hypershift-oadp-plugin-oadp-1.6:
-    name: hypershift-oadp-plugin
-    namespace: konveyor
-    tag: hypershift-oadp-plugin-oadp-1.6
-  kubevirt-datamover-controller-oadp-1.6:
-    name: kubevirt-datamover-controller
-    namespace: konveyor
-    tag: kubevirt-datamover-controller-oadp-1.6
-  kubevirt-datamover-plugin-oadp-1.6:
-    name: kubevirt-datamover-plugin
-    namespace: konveyor
-    tag: kubevirt-datamover-plugin-oadp-1.6
-  kubevirt-velero-plugin-oadp-1.6:
-    name: kubevirt-velero-plugin
-    namespace: konveyor
-    tag: kubevirt-velero-plugin-oadp-1.6
-  oadp-cli-oadp-1.6:
-    name: oadp-cli
-    namespace: konveyor
-    tag: oadp-cli-oadp-1.6
-  oadp-must-gather-1.6:
-    name: oadp-must-gather
-    namespace: konveyor
-    tag: oadp-must-gather-1.6
-  oadp-non-admin-oadp-1.6:
-    name: oadp-non-admin
-    namespace: konveyor
-    tag: oadp-non-admin-oadp-1.6
-  oadp-vm-file-restore:
-    name: oadp-vm-file-restore
-    namespace: konveyor
-    tag: oadp-1.6
-  oadp-vmdp-oadp-1.6:
-    name: oadp-vmdp
-    namespace: konveyor
-    tag: oadp-vmdp-oadp-1.6
-  oadp-vmfr-access:
-    name: oadp-vmfr-access
-    namespace: konveyor
-    tag: oadp-1.6
-  oadp-vmfr-access-filebrowser-oadp-1.6:
-    name: oadp-vmfr-access-filebrowser
-    namespace: konveyor
-    tag: oadp-vmfr-access-filebrowser-oadp-1.6
-  oadp-vmfr-access-sshd:
-    name: oadp-vmfr-access-sshd
-    namespace: konveyor
-    tag: oadp-1.6
-  openshift-velero-plugin-oadp-1.6:
-    name: openshift-velero-plugin
-    namespace: konveyor
-    tag: openshift-velero-plugin-oadp-1.6
-  velero-oadp-1.6:
-    name: velero
-    namespace: konveyor
-    tag: velero-oadp-1.6
-  velero-plugin-for-aws-oadp-1.6:
-    name: velero-plugin-for-aws
-    namespace: konveyor
-    tag: velero-plugin-for-aws-oadp-1.6
-  velero-plugin-for-gcp-oadp-1.6:
-    name: velero-plugin-for-gcp
-    namespace: konveyor
-    tag: velero-plugin-for-gcp-oadp-1.6
-  velero-plugin-for-legacy-aws-oadp-1.6:
-    name: velero-plugin-for-legacy-aws
-    namespace: konveyor
-    tag: velero-plugin-for-legacy-aws-oadp-1.6
-  velero-plugin-for-microsoft-azure-oadp-1.6:
-    name: velero-plugin-for-microsoft-azure
-    namespace: konveyor
-    tag: velero-plugin-for-microsoft-azure-oadp-1.6
-build_root:
-  image_stream_tag:
-    name: builder
-    namespace: konveyor
-    tag: ubi9-v1.26
-images:
-  items:
-  - dockerfile_path: Dockerfile
-    to: oadp-operator-1.6
-  - dockerfile_path: build/ci-Dockerfile
-    to: test-oadp-operator-1.6
-operator:
-  bundles:
-  - dockerfile_path: build/Dockerfile.bundle
-  substitutions:
-  - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6
-    with: oadp-operator-1.6
-  - pullspec: quay.io/konveyor/hypershift-oadp-plugin:oadp-1.6
-    with: hypershift-oadp-plugin-oadp-1.6
-  - pullspec: quay.io/konveyor/kubevirt-datamover-controller:oadp-1.6
-    with: kubevirt-datamover-controller-oadp-1.6
-  - pullspec: quay.io/konveyor/kubevirt-datamover-plugin:oadp-1.6
-    with: kubevirt-datamover-plugin-oadp-1.6
-  - pullspec: quay.io/konveyor/kubevirt-velero-plugin:oadp-1.6
-    with: kubevirt-velero-plugin-oadp-1.6
-  - pullspec: quay.io/konveyor/oadp-cli-binaries:oadp-1.6
-    with: oadp-cli-oadp-1.6
-  - pullspec: quay.io/konveyor/oadp-must-gather:oadp-1.6
-    with: oadp-must-gather-1.6
-  - pullspec: quay.io/konveyor/oadp-non-admin:oadp-1.6
-    with: oadp-non-admin-oadp-1.6
-  - pullspec: quay.io/konveyor/oadp-vm-file-restore:oadp-1.6
-    with: oadp-vm-file-restore
-  - pullspec: quay.io/konveyor/oadp-vmdp-binaries:oadp-1.6
-    with: oadp-vmdp-oadp-1.6
-  - pullspec: quay.io/konveyor/oadp-vmfr-access-filebrowser:oadp-1.6
-    with: oadp-vmfr-access-filebrowser-oadp-1.6
-  - pullspec: quay.io/konveyor/oadp-vmfr-access-sshd:oadp-1.6
-    with: oadp-vmfr-access-sshd
-  - pullspec: quay.io/konveyor/oadp-vmfr-access:oadp-1.6
-    with: oadp-vmfr-access
-  - pullspec: quay.io/konveyor/openshift-velero-plugin:oadp-1.6
-    with: openshift-velero-plugin-oadp-1.6
-  - pullspec: quay.io/konveyor/velero-plugin-for-aws:oadp-1.6
-    with: velero-plugin-for-aws-oadp-1.6
-  - pullspec: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.6
-    with: velero-plugin-for-gcp-oadp-1.6
-  - pullspec: quay.io/konveyor/velero-plugin-for-legacy-aws:oadp-1.6
-    with: velero-plugin-for-legacy-aws-oadp-1.6
-  - pullspec: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.6
-    with: velero-plugin-for-microsoft-azure-oadp-1.6
-  - pullspec: quay.io/konveyor/velero:oadp-1.6
-    with: velero-oadp-1.6
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "5.1"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 1000m
-      memory: 512Mi
-tests:
-- always_run: false
-  as: e2e-test-cli-aws
-  run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make TEST_CLI=true test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- always_run: false
-  as: e2e-test-aws
-  run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- as: e2e-test-aws-periodic
-  cron: 0 4 * * *
-  reporter_config:
-    channel: '#oadp-cicd'
-    job_states_to_report:
-    - failure
-    - error
-    report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-      ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-      :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-      logs> :alert-siren: {{end}}'
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- always_run: false
-  as: e2e-test-kubevirt-aws
-  run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make TEST_VIRT=true test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- as: e2e-test-kubevirt-aws-periodic
-  cron: 0 4 * * *
-  reporter_config:
-    channel: '#oadp-cicd'
-    job_states_to_report:
-    - failure
-    - error
-    report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-      ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-      :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-      logs> :alert-siren: {{end}}'
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make TEST_VIRT=true test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- always_run: false
-  as: e2e-test-hcp-aws
-  run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make TEST_HCP=true test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- as: e2e-test-hcp-aws-periodic
-  cron: 0 5 * * *
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make TEST_HCP=true test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-- as: e2e-test-cli-aws-periodic
-  cron: 0 2 * * *
-  steps:
-    cluster_profile: openshift-org-aws
-    dependencies:
-      OO_INDEX: ci-index
-    env:
-      OO_CHANNEL: stable
-      OO_INSTALL_NAMESPACE: openshift-adp
-      OO_PACKAGE: oadp-operator
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: e2e
-      cli: latest
-      commands: make TEST_CLI=true test-e2e
-      credentials:
-      - mount_path: /var/run/oadp-credentials
-        name: oadp-credentials
-        namespace: test-credentials
-      from: test-oadp-operator-1.6
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 512Mi
-    workflow: optional-operators-ci-aws
-zz_generated_metadata:
-  branch: oadp-1.6
-  org: openshift
-  repo: oadp-operator
-  variant: "5.1"
diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml
index 822b67c00e850..c0058c27f9cda 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml
@@ -140,6 +140,7 @@ resources:
 tests:
 - always_run: false
   as: e2e-test-cli-aws
+  optional: true
   run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
   steps:
     cluster_profile: openshift-org-aws
@@ -166,6 +167,7 @@ tests:
     workflow: optional-operators-ci-aws
 - always_run: false
   as: e2e-test-aws
+  optional: true
   run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
   steps:
     cluster_profile: openshift-org-aws
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
index 14a9aa5064622..795ffba711cbe 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
@@ -1555,378 +1555,6 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
-- agent: kubernetes
-  cluster: build11
-  cron: 0 4 * * *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  extra_refs:
-  - base_ref: oadp-1.6
-    org: openshift
-    repo: oadp-operator
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-    ci-operator.openshift.io/variant: "5.1"
-    ci.openshift.io/generator: prowgen
-    job-release: "5.1"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-aws-periodic
-  reporter_config:
-    slack:
-      channel: '#oadp-cicd'
-      job_states_to_report:
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-        :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> :alert-siren: {{end}}'
-  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=e2e-test-aws-periodic
-      - --variant=5.1
-      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
-- agent: kubernetes
-  cluster: build11
-  cron: 0 2 * * *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  extra_refs:
-  - base_ref: oadp-1.6
-    org: openshift
-    repo: oadp-operator
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-    ci-operator.openshift.io/variant: "5.1"
-    ci.openshift.io/generator: prowgen
-    job-release: "5.1"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-cli-aws-periodic
-  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=e2e-test-cli-aws-periodic
-      - --variant=5.1
-      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
-- agent: kubernetes
-  cluster: build11
-  cron: 0 5 * * *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  extra_refs:
-  - base_ref: oadp-1.6
-    org: openshift
-    repo: oadp-operator
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-    ci-operator.openshift.io/variant: "5.1"
-    ci.openshift.io/generator: prowgen
-    job-release: "5.1"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-hcp-aws-periodic
-  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=e2e-test-hcp-aws-periodic
-      - --variant=5.1
-      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
-- agent: kubernetes
-  cluster: build11
-  cron: 0 4 * * *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  extra_refs:
-  - base_ref: oadp-1.6
-    org: openshift
-    repo: oadp-operator
-    sparse_checkout_files:
-    - Dockerfile
-    - build/ci-Dockerfile
-  labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-    ci-operator.openshift.io/variant: "5.1"
-    ci.openshift.io/generator: prowgen
-    job-release: "5.1"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-kubevirt-aws-periodic
-  reporter_config:
-    slack:
-      channel: '#oadp-cicd'
-      job_states_to_report:
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-        :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> :alert-siren: {{end}}'
-  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=e2e-test-kubevirt-aws-periodic
-      - --variant=5.1
-      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
 - agent: kubernetes
   cluster: build11
   cron: 0 4 * * *
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
index c195404bfa62e..8d0800ecf3ad3 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
@@ -1888,478 +1888,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )5.0-images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^oadp-1\.6$
-    - ^oadp-1\.6-
-    cluster: build01
-    context: ci/prow/5.1-ci-index
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - build/ci-Dockerfile
-    labels:
-      ci-operator.openshift.io/variant: "5.1"
-      ci.openshift.io/generator: prowgen
-      job-release: "5.1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oadp-operator-oadp-1.6-5.1-ci-index
-    rerun_command: /test 5.1-ci-index
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=ci-index
-        - --variant=5.1
-        command:
-        - ci-operator
-        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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( | .* )5.1-ci-index,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^oadp-1\.6$
-    - ^oadp-1\.6-
-    cluster: build01
-    context: ci/prow/5.1-e2e-test-aws
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - build/ci-Dockerfile
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-      ci-operator.openshift.io/variant: "5.1"
-      ci.openshift.io/generator: prowgen
-      job-release: "5.1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-aws
-    rerun_command: /test 5.1-e2e-test-aws
-    run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-    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=e2e-test-aws
-        - --variant=5.1
-        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( | .* )5.1-e2e-test-aws,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^oadp-1\.6$
-    - ^oadp-1\.6-
-    cluster: build01
-    context: ci/prow/5.1-e2e-test-cli-aws
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - build/ci-Dockerfile
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-      ci-operator.openshift.io/variant: "5.1"
-      ci.openshift.io/generator: prowgen
-      job-release: "5.1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-cli-aws
-    rerun_command: /test 5.1-e2e-test-cli-aws
-    run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-    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=e2e-test-cli-aws
-        - --variant=5.1
-        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( | .* )5.1-e2e-test-cli-aws,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^oadp-1\.6$
-    - ^oadp-1\.6-
-    cluster: build01
-    context: ci/prow/5.1-e2e-test-hcp-aws
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - build/ci-Dockerfile
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-      ci-operator.openshift.io/variant: "5.1"
-      ci.openshift.io/generator: prowgen
-      job-release: "5.1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-hcp-aws
-    rerun_command: /test 5.1-e2e-test-hcp-aws
-    run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-    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=e2e-test-hcp-aws
-        - --variant=5.1
-        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( | .* )5.1-e2e-test-hcp-aws,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^oadp-1\.6$
-    - ^oadp-1\.6-
-    cluster: build01
-    context: ci/prow/5.1-e2e-test-kubevirt-aws
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - build/ci-Dockerfile
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-      ci-operator.openshift.io/variant: "5.1"
-      ci.openshift.io/generator: prowgen
-      job-release: "5.1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oadp-operator-oadp-1.6-5.1-e2e-test-kubevirt-aws
-    rerun_command: /test 5.1-e2e-test-kubevirt-aws
-    run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
-    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=e2e-test-kubevirt-aws
-        - --variant=5.1
-        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( | .* )5.1-e2e-test-kubevirt-aws,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^oadp-1\.6$
-    - ^oadp-1\.6-
-    cluster: build01
-    context: ci/prow/5.1-images
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - build/ci-Dockerfile
-    labels:
-      ci-operator.openshift.io/variant: "5.1"
-      ci.openshift.io/generator: prowgen
-      job-release: "5.1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oadp-operator-oadp-1.6-5.1-images
-    rerun_command: /test 5.1-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        - --variant=5.1
-        command:
-        - ci-operator
-        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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( | .* )5.1-images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
index 6d27b530d29b8..6c3227a3adb49 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
@@ -1057,6 +1057,7 @@ presubmits:
       job-release: "5.1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oadp-operator-oadp-dev-5.1-e2e-test-aws
+    optional: true
     rerun_command: /test 5.1-e2e-test-aws
     run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
     spec:
@@ -1145,6 +1146,7 @@ presubmits:
       job-release: "5.1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oadp-operator-oadp-dev-5.1-e2e-test-cli-aws
+    optional: true
     rerun_command: /test 5.1-e2e-test-cli-aws
     run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh
     spec: