diff --git a/ci-operator/config/openshift/ovn-kubernetes/OWNERS b/ci-operator/config/openshift/ovn-kubernetes/OWNERS
index 5616dfcf5dd4a..32874677e75b5 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/OWNERS
+++ b/ci-operator/config/openshift/ovn-kubernetes/OWNERS
@@ -1,13 +1,15 @@
 # DO NOT EDIT; this file is auto-generated using tools/populate-owners.
-# from https://github.com/openshift/cluster-network-operator/blob/2f116c6fe1e6cae22f1976856cc87410a10db7bf/OWNERS
+# from https://github.com/openshift/ovn-kubernetes/blob/94565d06932752933dfb68a89ac519644352bf40/OWNERS
 # See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
 
-reviewers:
-  - JacobTanenbaum
-  - pecameron
-  - squeed
-  - dcbw
 approvers:
-  - pecameron
-  - dcbw
-  - russellb
+- pecameron
+- dcbw
+- russellb
+- danwinship
+reviewers:
+- JacobTanenbaum
+- pecameron
+- squeed
+- dcbw
+- danwinship
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml
index b2e4473e117aa..1a7ec6923a2c9 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml
@@ -26,8 +26,3 @@ resources:
 tag_specification:
   name: "4.2"
   namespace: ocp
-tests:
-- as: e2e-aws
-  commands: TEST_SUITE=openshift/conformance/parallel run-tests
-  openshift_installer:
-    cluster_profile: aws
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
index 12c5740f12e5d..8eb6d701dbf18 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
@@ -141,6 +141,74 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    context: ci/prow/e2e-aws-ovn-kubernetes
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-kubernetes
+    optional: true
+    rerun_command: /test e2e-aws-ovn-kubernetes
+    run_if_changed: ([^d]|[^m]d|[^.]md)$
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --secret-dir=/usr/local/e2e-aws-ovn-kubernetes-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-ovn-kubernetes
+        - --template=/usr/local/e2e-aws-ovn-kubernetes
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_NETWORK_TYPE
+          value: OVNKubernetes
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-cluster-network-operator-master.yaml
+              name: ci-operator-master-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-ovn-kubernetes
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/e2e-aws-ovn-kubernetes-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-kubernetes
+          name: job-definition
+          subPath: cluster-launch-installer-e2e.yaml
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - configMap:
+          name: prow-job-cluster-launch-installer-e2e
+        name: job-definition
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-kubernetes,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ovn-kubernetes/OWNERS b/ci-operator/jobs/openshift/ovn-kubernetes/OWNERS
index 5616dfcf5dd4a..32874677e75b5 100644
--- a/ci-operator/jobs/openshift/ovn-kubernetes/OWNERS
+++ b/ci-operator/jobs/openshift/ovn-kubernetes/OWNERS
@@ -1,13 +1,15 @@
 # DO NOT EDIT; this file is auto-generated using tools/populate-owners.
-# from https://github.com/openshift/cluster-network-operator/blob/2f116c6fe1e6cae22f1976856cc87410a10db7bf/OWNERS
+# from https://github.com/openshift/ovn-kubernetes/blob/94565d06932752933dfb68a89ac519644352bf40/OWNERS
 # See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
 
-reviewers:
-  - JacobTanenbaum
-  - pecameron
-  - squeed
-  - dcbw
 approvers:
-  - pecameron
-  - dcbw
-  - russellb
+- pecameron
+- dcbw
+- russellb
+- danwinship
+reviewers:
+- JacobTanenbaum
+- pecameron
+- squeed
+- dcbw
+- danwinship
diff --git a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
index 8dd1376abae99..56b178c7a499d 100644
--- a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
@@ -1,30 +1,31 @@
 presubmits:
   openshift/ovn-kubernetes:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - master
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn-kubernetes
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ovn-kubernetes-master-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-kubernetes
+    rerun_command: /test e2e-aws-ovn-kubernetes
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-ovn-kubernetes-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-aws
-        - --template=/usr/local/e2e-aws
+        - --target=e2e-aws-ovn-kubernetes
+        - --template=/usr/local/e2e-aws-ovn-kubernetes
         command:
         - ci-operator
         env:
+        - name: CLUSTER_NETWORK_TYPE
+          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
         - name: CONFIG_SPEC
@@ -33,7 +34,7 @@ presubmits:
               key: openshift-ovn-kubernetes-master.yaml
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
-          value: e2e-aws
+          value: e2e-aws-ovn-kubernetes
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
@@ -43,9 +44,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-kubernetes-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-aws
+        - mountPath: /usr/local/e2e-aws-ovn-kubernetes
           name: job-definition
           subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
@@ -64,7 +65,7 @@ presubmits:
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-kubernetes,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
index 9ae8db56ac228..3a3338c1ca8da 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
@@ -21,6 +21,7 @@ parameters:
   required: true
 - name: BASE_DOMAIN
 - name: CLUSTER_NETWORK_MANIFEST
+- name: CLUSTER_NETWORK_TYPE
 - name: ENABLE_FIPS
 - name: ENABLE_PROXY
 
@@ -810,6 +811,13 @@ objects:
         EOF
         fi
 
+        if [[ -n "${CLUSTER_NETWORK_TYPE}" ]]; then
+          cat >> /tmp/artifacts/installer/install-config.yaml << EOF
+        networking:
+          networkType: ${CLUSTER_NETWORK_TYPE}
+        EOF
+        fi
+
         # TODO: Replace with a more concise manifest injection approach
         if [[ -n "${CLUSTER_NETWORK_MANIFEST}" ]]; then
             openshift-install --dir=/tmp/artifacts/installer/ create manifests