diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml
index 9c6a5c2deac4b..d3c3e75b36934 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml
@@ -304,7 +304,7 @@ tests:
           cpu: 1000m
           memory: 512Mi
     workflow: optional-operators-ci-aws
-- as: e2e-test-kubevirt-aws-periodic
+- as: virt-nokdm-e2e-test-aws-periodic
   cron: 0 4 * * *
   reporter_config:
     channel: '#oadp-cicd'
@@ -325,13 +325,51 @@ tests:
       OO_INSTALL_NAMESPACE: openshift-adp
       OO_PACKAGE: oadp-operator
       OO_TARGET_NAMESPACES: '!install'
-      TEST_NAME: e2e-test-kubevirt-aws-periodic
+      TEST_NAME: virt-nokdm-e2e-test-aws-periodic
     post:
     - ref: oadp-analyze-e2e-failure
     test:
     - as: e2e
       cli: latest
-      commands: make TEST_VIRT=true test-e2e
+      commands: make TEST_VIRT=true TEST_VIRT_KDM=false 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: virt-kdm-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:
+      OADP_BRANCH: oadp-1.6
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-adp
+      OO_PACKAGE: oadp-operator
+      OO_TARGET_NAMESPACES: '!install'
+      TEST_NAME: virt-kdm-e2e-test-aws-periodic
+    post:
+    - ref: oadp-analyze-e2e-failure
+    test:
+    - as: e2e
+      cli: latest
+      commands: make TEST_VIRT_KDM=true test-e2e
       credentials:
       - mount_path: /var/run/oadp-credentials
         name: oadp-credentials
diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.23.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.23.yaml
index 423ee1c4179bb..bf78ae64d8e84 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.23.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.23.yaml
@@ -196,7 +196,7 @@ tests:
           cpu: 1000m
           memory: 512Mi
     workflow: optional-operators-ci-aws
-- as: e2e-test-kubevirt-aws-periodic
+- as: virt-nokdm-e2e-test-aws-periodic
   cron: 0 4 * * *
   reporter_config:
     channel: '#oadp-cicd'
@@ -217,13 +217,51 @@ tests:
       OO_INSTALL_NAMESPACE: openshift-adp
       OO_PACKAGE: oadp-operator
       OO_TARGET_NAMESPACES: '!install'
-      TEST_NAME: e2e-test-kubevirt-aws-periodic
+      TEST_NAME: virt-nokdm-e2e-test-aws-periodic
     post:
     - ref: oadp-analyze-e2e-failure
     test:
     - as: e2e
       cli: latest
-      commands: make TEST_VIRT=true test-e2e
+      commands: make TEST_VIRT=true TEST_VIRT_KDM=false 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: virt-kdm-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:
+      OADP_BRANCH: oadp-1.6
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-adp
+      OO_PACKAGE: oadp-operator
+      OO_TARGET_NAMESPACES: '!install'
+      TEST_NAME: virt-kdm-e2e-test-aws-periodic
+    post:
+    - ref: oadp-analyze-e2e-failure
+    test:
+    - as: e2e
+      cli: latest
+      commands: make TEST_VIRT_KDM=true test-e2e
       credentials:
       - mount_path: /var/run/oadp-credentials
         name: oadp-credentials
diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml
index c8e0f480b67ae..9ece413c73d5e 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml
@@ -300,7 +300,7 @@ tests:
           cpu: 1000m
           memory: 512Mi
     workflow: optional-operators-ci-aws
-- as: e2e-test-kubevirt-aws-periodic
+- as: virt-nokdm-e2e-test-aws-periodic
   cron: 0 4 * * *
   reporter_config:
     channel: '#oadp-cicd'
@@ -321,13 +321,51 @@ tests:
       OO_INSTALL_NAMESPACE: openshift-adp
       OO_PACKAGE: oadp-operator
       OO_TARGET_NAMESPACES: '!install'
-      TEST_NAME: e2e-test-kubevirt-aws-periodic
+      TEST_NAME: virt-nokdm-e2e-test-aws-periodic
     post:
     - ref: oadp-analyze-e2e-failure
     test:
     - as: e2e
       cli: latest
-      commands: make TEST_VIRT=true test-e2e
+      commands: make TEST_VIRT=true TEST_VIRT_KDM=false 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: virt-kdm-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:
+      OADP_BRANCH: oadp-1.6
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-adp
+      OO_PACKAGE: oadp-operator
+      OO_TARGET_NAMESPACES: '!install'
+      TEST_NAME: virt-kdm-e2e-test-aws-periodic
+    post:
+    - ref: oadp-analyze-e2e-failure
+    test:
+    - as: e2e
+      cli: latest
+      commands: make TEST_VIRT_KDM=true test-e2e
       credentials:
       - mount_path: /var/run/oadp-credentials
         name: oadp-credentials
diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml
index 642b7d924f092..fc133c297e2c9 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml
@@ -300,7 +300,7 @@ tests:
           cpu: 1000m
           memory: 512Mi
     workflow: optional-operators-ci-aws
-- as: e2e-test-kubevirt-aws-periodic
+- as: virt-nokdm-e2e-test-aws-periodic
   cron: 0 4 * * *
   reporter_config:
     channel: '#oadp-cicd'
@@ -321,13 +321,51 @@ tests:
       OO_INSTALL_NAMESPACE: openshift-adp
       OO_PACKAGE: oadp-operator
       OO_TARGET_NAMESPACES: '!install'
-      TEST_NAME: e2e-test-kubevirt-aws-periodic
+      TEST_NAME: virt-nokdm-e2e-test-aws-periodic
     post:
     - ref: oadp-analyze-e2e-failure
     test:
     - as: e2e
       cli: latest
-      commands: make TEST_VIRT=true test-e2e
+      commands: make TEST_VIRT=true TEST_VIRT_KDM=false test-e2e
+      credentials:
+      - mount_path: /var/run/oadp-credentials
+        name: oadp-credentials
+        namespace: test-credentials
+      from: test-oadp-operator
+      resources:
+        requests:
+          cpu: 1000m
+          memory: 512Mi
+    workflow: optional-operators-ci-aws
+- as: virt-kdm-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:
+      OADP_BRANCH: oadp-dev
+      OO_CHANNEL: dev
+      OO_INSTALL_NAMESPACE: openshift-adp
+      OO_PACKAGE: oadp-operator
+      OO_TARGET_NAMESPACES: '!install'
+      TEST_NAME: virt-kdm-e2e-test-aws-periodic
+    post:
+    - ref: oadp-analyze-e2e-failure
+    test:
+    - as: e2e
+      cli: latest
+      commands: make TEST_VIRT_KDM=true test-e2e
       credentials:
       - mount_path: /var/run/oadp-credentials
         name: oadp-credentials
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 c2b7c69aad45e..0ef17add48649 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
@@ -242,7 +242,7 @@ tests:
           cpu: 1000m
           memory: 512Mi
     workflow: optional-operators-ci-aws
-- as: e2e-test-kubevirt-aws-periodic
+- as: virt-nokdm-e2e-test-aws-periodic
   cron: 0 4 * * *
   reporter_config:
     channel: '#oadp-cicd'
@@ -263,13 +263,51 @@ tests:
       OO_INSTALL_NAMESPACE: openshift-adp
       OO_PACKAGE: oadp-operator
       OO_TARGET_NAMESPACES: '!install'
-      TEST_NAME: e2e-test-kubevirt-aws-periodic
+      TEST_NAME: virt-nokdm-e2e-test-aws-periodic
     post:
     - ref: oadp-analyze-e2e-failure
     test:
     - as: e2e
       cli: latest
-      commands: make TEST_VIRT=true test-e2e
+      commands: make TEST_VIRT=true TEST_VIRT_KDM=false test-e2e
+      credentials:
+      - mount_path: /var/run/oadp-credentials
+        name: oadp-credentials
+        namespace: test-credentials
+      from: test-oadp-operator
+      resources:
+        requests:
+          cpu: 1000m
+          memory: 512Mi
+    workflow: optional-operators-ci-aws
+- as: virt-kdm-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:
+      OADP_BRANCH: oadp-dev
+      OO_CHANNEL: dev
+      OO_INSTALL_NAMESPACE: openshift-adp
+      OO_PACKAGE: oadp-operator
+      OO_TARGET_NAMESPACES: '!install'
+      TEST_NAME: virt-kdm-e2e-test-aws-periodic
+    post:
+    - ref: oadp-analyze-e2e-failure
+    test:
+    - as: e2e
+      cli: latest
+      commands: make TEST_VIRT_KDM=true test-e2e
       credentials:
       - mount_path: /var/run/oadp-credentials
         name: oadp-credentials
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 6ce8d48c306ed..015daa5106428 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
@@ -363,7 +363,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 4 * * *
+  cron: 0 6 * * 1
   decorate: true
   decoration_config:
     sparse_checkout_files:
@@ -383,17 +383,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.22"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-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}}'
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-tls-pqc-readiness-periodic
   spec:
     containers:
     - args:
@@ -402,7 +392,7 @@ periodics:
       - --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
+      - --target=tls-pqc-readiness-periodic
       - --variant=4.22
       command:
       - ci-operator
@@ -481,7 +471,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.22"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-tls-pqc-readiness-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-tls13-adherence-periodic
   spec:
     containers:
     - args:
@@ -490,7 +480,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=tls-pqc-readiness-periodic
+      - --target=tls13-adherence-periodic
       - --variant=4.22
       command:
       - ci-operator
@@ -549,7 +539,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 6 * * 1
+  cron: 0 4 * * *
   decorate: true
   decoration_config:
     sparse_checkout_files:
@@ -569,7 +559,17 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.22"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-tls13-adherence-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-virt-kdm-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:
@@ -578,7 +578,105 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=tls13-adherence-periodic
+      - --target=virt-kdm-e2e-test-aws-periodic
+      - --variant=4.22
+      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: build05
+  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: "4.22"
+    ci.openshift.io/generator: prowgen
+    job-release: "4.22"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.22-virt-nokdm-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=virt-nokdm-e2e-test-aws-periodic
       - --variant=4.22
       command:
       - ci-operator
@@ -911,7 +1009,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 4 * * *
+  cron: 0 6 * * 1
   decorate: true
   decoration_config:
     sparse_checkout_files:
@@ -931,17 +1029,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.23"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-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}}'
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-tls-pqc-readiness-periodic
   spec:
     containers:
     - args:
@@ -950,7 +1038,7 @@ periodics:
       - --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
+      - --target=tls-pqc-readiness-periodic
       - --variant=4.23
       command:
       - ci-operator
@@ -1029,7 +1117,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.23"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-tls-pqc-readiness-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-tls13-adherence-periodic
   spec:
     containers:
     - args:
@@ -1038,7 +1126,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=tls-pqc-readiness-periodic
+      - --target=tls13-adherence-periodic
       - --variant=4.23
       command:
       - ci-operator
@@ -1097,7 +1185,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 6 * * 1
+  cron: 0 4 * * *
   decorate: true
   decoration_config:
     sparse_checkout_files:
@@ -1117,7 +1205,17 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.23"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-tls13-adherence-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-virt-kdm-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:
@@ -1126,7 +1224,105 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=tls13-adherence-periodic
+      - --target=virt-kdm-e2e-test-aws-periodic
+      - --variant=4.23
+      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: build05
+  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: "4.23"
+    ci.openshift.io/generator: prowgen
+    job-release: "4.23"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-4.23-virt-nokdm-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=virt-nokdm-e2e-test-aws-periodic
       - --variant=4.23
       command:
       - ci-operator
@@ -1479,7 +1675,105 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "5.0"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.0-e2e-test-kubevirt-aws-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-kdm-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=virt-kdm-e2e-test-aws-periodic
+      - --variant=5.0
+      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: build05
+  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.0"
+    ci.openshift.io/generator: prowgen
+    job-release: "5.0"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-nokdm-e2e-test-aws-periodic
   reporter_config:
     slack:
       channel: '#oadp-cicd'
@@ -1498,7 +1792,7 @@ periodics:
       - --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
+      - --target=virt-nokdm-e2e-test-aws-periodic
       - --variant=5.0
       command:
       - ci-operator
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
index 95389b6af50d4..8a17f91686f1c 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
@@ -755,7 +755,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "5.0"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-dev-5.0-e2e-test-kubevirt-aws-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-dev-5.0-virt-kdm-e2e-test-aws-periodic
   reporter_config:
     slack:
       channel: '#oadp-cicd'
@@ -774,7 +774,105 @@ periodics:
       - --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
+      - --target=virt-kdm-e2e-test-aws-periodic
+      - --variant=5.0
+      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: build05
+  cron: 0 4 * * *
+  decorate: true
+  decoration_config:
+    sparse_checkout_files:
+    - Dockerfile
+    - build/ci-Dockerfile
+  extra_refs:
+  - base_ref: oadp-dev
+    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.0"
+    ci.openshift.io/generator: prowgen
+    job-release: "5.0"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-oadp-operator-oadp-dev-5.0-virt-nokdm-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=virt-nokdm-e2e-test-aws-periodic
       - --variant=5.0
       command:
       - ci-operator
@@ -1127,7 +1225,105 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "5.1"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-oadp-operator-oadp-dev-5.1-e2e-test-kubevirt-aws-periodic
+  name: periodic-ci-openshift-oadp-operator-oadp-dev-5.1-virt-kdm-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=virt-kdm-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: build05
+  cron: 0 4 * * *
+  decorate: true
+  decoration_config:
+    sparse_checkout_files:
+    - Dockerfile
+    - build/ci-Dockerfile
+  extra_refs:
+  - base_ref: oadp-dev
+    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-dev-5.1-virt-nokdm-e2e-test-aws-periodic
   reporter_config:
     slack:
       channel: '#oadp-cicd'
@@ -1146,7 +1342,7 @@ periodics:
       - --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
+      - --target=virt-nokdm-e2e-test-aws-periodic
       - --variant=5.1
       command:
       - ci-operator