diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.13.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.13.yaml
index 2fe5786d4a3b8..96b1500b992a0 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.13.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.13.yaml
@@ -187,6 +187,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-cilium
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.14.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.14.yaml
index e245dbc721c04..cc2d3249c4f96 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.14.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.14.yaml
@@ -204,6 +204,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-cilium
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.15.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.15.yaml
index 7c08d55ae8fe8..d2fe33e71ab1d 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.15.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.15.yaml
@@ -257,6 +257,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-upgrade-out-of-change
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.16.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.16.yaml
index 1c7dc38ccabce..18d23ed187529 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.16.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.16.yaml
@@ -271,6 +271,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-upgrade-out-of-change
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.17.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.17.yaml
index 706db2fcfe09d..11f8a77cae411 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.17.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.17.yaml
@@ -156,6 +156,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-upgrade-out-of-change
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.18.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.18.yaml
index 86858ca0895b7..9f8d2a76e1280 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.18.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.18.yaml
@@ -156,6 +156,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-upgrade-out-of-change
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.19.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.19.yaml
index d9d216f7b31bc..be57c49e98341 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.19.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.19.yaml
@@ -156,6 +156,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-upgrade-out-of-change
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.20.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.20.yaml
index bacd8f6b3a54f..c6a873bdaf096 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.20.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.20.yaml
@@ -157,6 +157,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-upgrade-out-of-change
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.21.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.21.yaml
index 73cff6f193d02..06dea300ed383 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.21.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.21.yaml
@@ -169,6 +169,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-techpreview-upgrade
   interval: 168h
   steps:
diff --git a/ci-operator/config/openshift/release/openshift-release-main__ci-4.22.yaml b/ci-operator/config/openshift/release/openshift-release-main__ci-4.22.yaml
index 6ab6c3238e2a1..80c42b48eefd4 100644
--- a/ci-operator/config/openshift/release/openshift-release-main__ci-4.22.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-main__ci-4.22.yaml
@@ -257,6 +257,26 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-upgrade-azure-ovn
+- as: e2e-azure-v7-ovn-upgrade
+  interval: 720h
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      COMPUTE_NODE_TYPE: Standard_D4s_v7
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v7
+      CUSTOM_AZURE_REGION: eastus
+      FAIL_ON_CORE_DUMP: "true"
+      TEST_TYPE: upgrade-conformance
+    observers:
+      enable:
+      - observers-resource-watch
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-custom-region
+    - ref: ovn-conf
+    - chain: ipi-install-stableinitial
+    - ref: ipi-azure-rbac
+    workflow: openshift-upgrade-azure-ovn
 - as: e2e-azure-ovn-techpreview-upgrade
   interval: 168h
   steps:
diff --git a/ci-operator/jobs/openshift/release/openshift-release-main-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-main-periodics.yaml
index 0830cf070fc92..7e7845650e7f1 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-main-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-main-periodics.yaml
@@ -12943,6 +12943,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.13
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.13"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.13-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.13
+      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: build08
   decorate: true
@@ -17145,6 +17229,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.14
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.14"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.14-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.14
+      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: build08
   decorate: true
@@ -21850,7 +22018,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build08
+  cluster: build09
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -21858,16 +22026,16 @@ periodics:
   - base_ref: main
     org: openshift
     repo: release
-  interval: 168h
+  interval: 720h
   labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
     ci-operator.openshift.io/variant: ci-4.15
     ci.openshift.io/generator: prowgen
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-cilium
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-azure-v7-ovn-upgrade
   spec:
     containers:
     - args:
@@ -21876,7 +22044,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-cilium
+      - --target=e2e-azure-v7-ovn-upgrade
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -21951,7 +22119,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-cilium
   spec:
     containers:
     - args:
@@ -21960,7 +22128,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-ovn
+      - --target=e2e-gcp-cilium
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22035,7 +22203,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-mount-ns-hiding
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn
   spec:
     containers:
     - args:
@@ -22044,7 +22212,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-ovn-mount-ns-hiding
+      - --target=e2e-gcp-ovn
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22119,7 +22287,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-techpreview
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-mount-ns-hiding
   spec:
     containers:
     - args:
@@ -22128,7 +22296,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-ovn-techpreview
+      - --target=e2e-gcp-ovn-mount-ns-hiding
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22203,7 +22371,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-techpreview-serial
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-techpreview
   spec:
     containers:
     - args:
@@ -22212,7 +22380,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-ovn-techpreview-serial
+      - --target=e2e-gcp-ovn-techpreview
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22287,7 +22455,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-techpreview-serial
   spec:
     containers:
     - args:
@@ -22296,7 +22464,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-ovn-upgrade
+      - --target=e2e-gcp-ovn-techpreview-serial
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22371,7 +22539,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-upgrade-out-of-change
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-upgrade
   spec:
     containers:
     - args:
@@ -22380,7 +22548,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-ovn-upgrade-out-of-change
+      - --target=e2e-gcp-ovn-upgrade
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22455,7 +22623,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-sdn
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-ovn-upgrade-out-of-change
   spec:
     containers:
     - args:
@@ -22464,7 +22632,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-sdn
+      - --target=e2e-gcp-ovn-upgrade-out-of-change
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22539,7 +22707,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-sdn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-sdn
   spec:
     containers:
     - args:
@@ -22548,7 +22716,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-sdn-upgrade
+      - --target=e2e-gcp-sdn
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22623,7 +22791,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-sdn-upgrade-out-of-change
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-sdn-upgrade
   spec:
     containers:
     - args:
@@ -22632,7 +22800,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-sdn-upgrade-out-of-change
+      - --target=e2e-gcp-sdn-upgrade
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22707,7 +22875,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-secureboot
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-sdn-upgrade-out-of-change
   spec:
     containers:
     - args:
@@ -22716,7 +22884,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-secureboot
+      - --target=e2e-gcp-sdn-upgrade-out-of-change
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22774,7 +22942,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build09
+  cluster: build08
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -22784,14 +22952,14 @@ periodics:
     repo: release
   interval: 168h
   labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
+    ci-operator.openshift.io/cloud: gcp
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp
     ci-operator.openshift.io/variant: ci-4.15
     ci.openshift.io/generator: prowgen
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-e2e-network-migration-rollback
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-gcp-secureboot
   spec:
     containers:
     - args:
@@ -22800,7 +22968,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-network-migration-rollback
+      - --target=e2e-gcp-secureboot
       - --variant=ci-4.15
       command:
       - ci-operator
@@ -22870,12 +23038,12 @@ periodics:
   labels:
     ci-operator.openshift.io/cloud: aws
     ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
-    ci-operator.openshift.io/variant: ci-4.15-upgrade-from-stable-4.14
+    ci-operator.openshift.io/variant: ci-4.15
     ci.openshift.io/generator: prowgen
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-ovn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.15-e2e-network-migration-rollback
   spec:
     containers:
     - args:
@@ -22884,8 +23052,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-upgrade
-      - --variant=ci-4.15-upgrade-from-stable-4.14
+      - --target=e2e-network-migration-rollback
+      - --variant=ci-4.15
       command:
       - ci-operator
       env:
@@ -22959,7 +23127,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-ovn-uwm
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-ovn-upgrade
   spec:
     containers:
     - args:
@@ -22968,7 +23136,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-uwm
+      - --target=e2e-aws-ovn-upgrade
       - --variant=ci-4.15-upgrade-from-stable-4.14
       command:
       - ci-operator
@@ -23043,7 +23211,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-sdn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-ovn-uwm
   spec:
     containers:
     - args:
@@ -23052,7 +23220,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-sdn-upgrade
+      - --target=e2e-aws-ovn-uwm
       - --variant=ci-4.15-upgrade-from-stable-4.14
       command:
       - ci-operator
@@ -23127,7 +23295,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-sdn-upgrade-infra
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-sdn-upgrade
   spec:
     containers:
     - args:
@@ -23136,7 +23304,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-sdn-upgrade-infra
+      - --target=e2e-aws-sdn-upgrade
       - --variant=ci-4.15-upgrade-from-stable-4.14
       command:
       - ci-operator
@@ -23211,7 +23379,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-sdn-upgrade-workload
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-sdn-upgrade-infra
   spec:
     containers:
     - args:
@@ -23220,7 +23388,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-sdn-upgrade-workload
+      - --target=e2e-aws-sdn-upgrade-infra
       - --variant=ci-4.15-upgrade-from-stable-4.14
       command:
       - ci-operator
@@ -23288,14 +23456,14 @@ periodics:
     repo: release
   interval: 168h
   labels:
-    ci-operator.openshift.io/cloud: azure4
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
     ci-operator.openshift.io/variant: ci-4.15-upgrade-from-stable-4.14
     ci.openshift.io/generator: prowgen
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-azure-ovn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-aws-sdn-upgrade-workload
   spec:
     containers:
     - args:
@@ -23304,7 +23472,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn-upgrade
+      - --target=e2e-aws-sdn-upgrade-workload
       - --variant=ci-4.15-upgrade-from-stable-4.14
       command:
       - ci-operator
@@ -23379,7 +23547,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-azure-sdn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-azure-ovn-upgrade
   spec:
     containers:
     - args:
@@ -23388,7 +23556,91 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-sdn-upgrade
+      - --target=e2e-azure-ovn-upgrade
+      - --variant=ci-4.15-upgrade-from-stable-4.14
+      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: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 168h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.15-upgrade-from-stable-4.14
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.15"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.15-upgrade-from-stable-4.14-e2e-azure-sdn-upgrade
+  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-azure-sdn-upgrade
       - --variant=ci-4.15-upgrade-from-stable-4.14
       command:
       - ci-operator
@@ -26721,6 +26973,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.16
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.16"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.16-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.16
+      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: build08
   decorate: true
@@ -30587,6 +30923,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.17
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.17"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.17-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.17
+      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: build08
   decorate: true
@@ -33863,6 +34283,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.18
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.18"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.18-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.18
+      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: build08
   cron: '@weekly'
@@ -38063,6 +38567,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.19
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.19"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.19-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.19
+      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: build08
   decorate: true
@@ -40181,7 +40769,91 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-cilium
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-cilium
+  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-aws-cilium
+      - --variant=ci-4.20
+      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: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 168h
+  labels:
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
+    ci-operator.openshift.io/variant: ci-4.20
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.20"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn
   spec:
     containers:
     - args:
@@ -40190,7 +40862,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-cilium
+      - --target=e2e-aws-ovn
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40265,7 +40937,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-no-capabilities
   spec:
     containers:
     - args:
@@ -40274,7 +40946,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn
+      - --target=e2e-aws-ovn-no-capabilities
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40349,7 +41021,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-no-capabilities
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-proxy
   spec:
     containers:
     - args:
@@ -40358,7 +41030,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-no-capabilities
+      - --target=e2e-aws-ovn-proxy
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40433,7 +41105,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-proxy
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-serial
   spec:
     containers:
     - args:
@@ -40442,7 +41114,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-proxy
+      - --target=e2e-aws-ovn-serial
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40517,7 +41189,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-serial
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview
   spec:
     containers:
     - args:
@@ -40526,7 +41198,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-serial
+      - --target=e2e-aws-ovn-techpreview
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40601,16 +41273,17 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview-serial-1of3
   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
+      - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 1"
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-techpreview
+      - --target=e2e-aws-ovn-techpreview-serial
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40685,14 +41358,14 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview-serial-1of3
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview-serial-2of3
   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
-      - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 1"
+      - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 2"
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
       - --target=e2e-aws-ovn-techpreview-serial
@@ -40770,14 +41443,14 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview-serial-2of3
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview-serial-3of3
   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
-      - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 2"
+      - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 3"
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
       - --target=e2e-aws-ovn-techpreview-serial
@@ -40855,17 +41528,16 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-techpreview-serial-3of3
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-upgrade
   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
-      - --multi-stage-param=SHARD_ARGS="--shard-count 3 --shard-id 3"
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-techpreview-serial
+      - --target=e2e-aws-ovn-upgrade
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -40940,7 +41612,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-upgrade-out-of-change
   spec:
     containers:
     - args:
@@ -40949,7 +41621,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-upgrade
+      - --target=e2e-aws-ovn-upgrade-out-of-change
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41008,6 +41680,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build09
+  cron: 3 1 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -41015,7 +41688,6 @@ periodics:
   - base_ref: main
     org: openshift
     repo: release
-  interval: 168h
   labels:
     ci-operator.openshift.io/cloud: aws
     ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
@@ -41024,7 +41696,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-ovn-upgrade-out-of-change
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-runc-upgrade
   spec:
     containers:
     - args:
@@ -41033,7 +41705,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-ovn-upgrade-out-of-change
+      - --target=e2e-aws-runc-upgrade
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41092,7 +41764,6 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build09
-  cron: 3 1 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -41100,6 +41771,7 @@ periodics:
   - base_ref: main
     org: openshift
     repo: release
+  interval: 168h
   labels:
     ci-operator.openshift.io/cloud: aws
     ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
@@ -41108,7 +41780,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-runc-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-upgrade-ovn-single-node
   spec:
     containers:
     - args:
@@ -41117,7 +41789,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-runc-upgrade
+      - --target=e2e-aws-upgrade-ovn-single-node
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41185,14 +41857,14 @@ periodics:
     repo: release
   interval: 168h
   labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
     ci-operator.openshift.io/variant: ci-4.20
     ci.openshift.io/generator: prowgen
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-aws-upgrade-ovn-single-node
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-cilium
   spec:
     containers:
     - args:
@@ -41201,7 +41873,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-upgrade-ovn-single-node
+      - --target=e2e-azure-cilium
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41276,7 +41948,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-cilium
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn
   spec:
     containers:
     - args:
@@ -41285,7 +41957,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-cilium
+      - --target=e2e-azure-ovn
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41360,7 +42032,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-serial
   spec:
     containers:
     - args:
@@ -41369,7 +42041,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn
+      - --target=e2e-azure-ovn-serial
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41444,7 +42116,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-serial
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-techpreview
   spec:
     containers:
     - args:
@@ -41453,7 +42125,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn-serial
+      - --target=e2e-azure-ovn-techpreview
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41528,7 +42200,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-techpreview
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-techpreview-serial
   spec:
     containers:
     - args:
@@ -41537,7 +42209,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn-techpreview
+      - --target=e2e-azure-ovn-techpreview-serial
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41612,7 +42284,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-techpreview-serial
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-upgrade
   spec:
     containers:
     - args:
@@ -41621,7 +42293,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn-techpreview-serial
+      - --target=e2e-azure-ovn-upgrade
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41696,7 +42368,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-upgrade-out-of-change
   spec:
     containers:
     - args:
@@ -41705,7 +42377,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn-upgrade
+      - --target=e2e-azure-ovn-upgrade-out-of-change
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41764,6 +42436,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build09
+  cron: 53 3 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -41771,7 +42444,6 @@ periodics:
   - base_ref: main
     org: openshift
     repo: release
-  interval: 168h
   labels:
     ci-operator.openshift.io/cloud: azure4
     ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
@@ -41780,7 +42452,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-ovn-upgrade-out-of-change
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-runc-upgrade
   spec:
     containers:
     - args:
@@ -41789,7 +42461,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-ovn-upgrade-out-of-change
+      - --target=e2e-azure-runc-upgrade
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -41848,7 +42520,6 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build09
-  cron: 53 3 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -41856,6 +42527,7 @@ periodics:
   - base_ref: main
     org: openshift
     repo: release
+  interval: 720h
   labels:
     ci-operator.openshift.io/cloud: azure4
     ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
@@ -41864,7 +42536,7 @@ periodics:
     ci.openshift.io/no-builds: "true"
     job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-runc-upgrade
+  name: periodic-ci-openshift-release-main-ci-4.20-e2e-azure-v7-ovn-upgrade
   spec:
     containers:
     - args:
@@ -41873,7 +42545,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-runc-upgrade
+      - --target=e2e-azure-v7-ovn-upgrade
       - --variant=ci-4.20
       command:
       - ci-operator
@@ -46049,6 +46721,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.21
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.21"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.21-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-4.21
+      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: build08
   decorate: true
@@ -50858,6 +51614,90 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build09
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: release
+  interval: 720h
+  labels:
+    ci-operator.openshift.io/cloud: azure4
+    ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+    ci-operator.openshift.io/variant: ci-4.22
+    ci.openshift.io/generator: prowgen
+    ci.openshift.io/no-builds: "true"
+    job-release: "4.22"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-release-main-ci-4.22-e2e-azure-v7-ovn-upgrade
+  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-azure-v7-ovn-upgrade
+      - --variant=ci-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: build08
   decorate: true