diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
index cf32340c7350d..2d9988a4aaa80 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
@@ -55,6 +55,16 @@ tests:
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
+- as: e2e-aws-sdn-single
+  commands: ""
+  steps:
+    cluster_profile: aws
+    workflow: origin-e2e-aws-sdn-single
+- as: e2e-aws-sdn-multi
+  commands: ""
+  steps:
+    cluster_profile: aws
+    workflow: origin-e2e-aws-sdn-multi
 - as: e2e-ovn-step-registry
   steps:
     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 a4896c9e8ec12..d557e40933046 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
@@ -192,6 +192,144 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/e2e-aws-sdn-multi
+    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-cluster-network-operator-master-e2e-aws-sdn-multi
+    rerun_command: /test e2e-aws-sdn-multi
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-sdn-multi-cluster-profile
+        - --target=e2e-aws-sdn-multi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-sdn-multi-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: regcred
+    trigger: (?m)^/test( | .* )e2e-aws-sdn-multi,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/e2e-aws-sdn-single
+    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-cluster-network-operator-master-e2e-aws-sdn-single
+    rerun_command: /test e2e-aws-sdn-single
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-sdn-single-cluster-profile
+        - --target=e2e-aws-sdn-single
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-sdn-single-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: regcred
+    trigger: (?m)^/test( | .* )e2e-aws-sdn-single,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/step-registry/origin/e2e-aws-sdn-multi/OWNERS b/ci-operator/step-registry/origin/e2e-aws-sdn-multi/OWNERS
new file mode 100644
index 0000000000000..1e5ec45e2335b
--- /dev/null
+++ b/ci-operator/step-registry/origin/e2e-aws-sdn-multi/OWNERS
@@ -0,0 +1,14 @@
+approvers:
+- danwinship
+- dcbw
+- knobunc
+- pecameron
+- squeed
+reviewers:
+- alexanderconstantinescu
+- danwinship
+- dcbw
+- jacobtanenbaum
+- pecameron
+- rcarrillocruz
+- squeed
diff --git a/ci-operator/step-registry/origin/e2e-aws-sdn-multi/origin-e2e-aws-sdn-multi-workflow.yaml b/ci-operator/step-registry/origin/e2e-aws-sdn-multi/origin-e2e-aws-sdn-multi-workflow.yaml
new file mode 100644
index 0000000000000..c21bd87da2fd2
--- /dev/null
+++ b/ci-operator/step-registry/origin/e2e-aws-sdn-multi/origin-e2e-aws-sdn-multi-workflow.yaml
@@ -0,0 +1,14 @@
+workflow:
+  as: origin-e2e-aws-sdn-multi
+  steps:
+    pre:
+    - chain: ipi-conf-aws
+    - ref: sdn-conf
+    - ref: sdn-conf-multi-manifest
+    - chain: ipi-install
+    test:
+    - ref: origin-e2e-test
+    post:
+    - chain: ipi-deprovision
+  documentation: |-
+    The Origin E2E SDN multi workflow executes the common end-to-end test suite with the OpenShiftSDN multitenant network plugin.
diff --git a/ci-operator/step-registry/origin/e2e-aws-sdn-single/OWNERS b/ci-operator/step-registry/origin/e2e-aws-sdn-single/OWNERS
new file mode 100644
index 0000000000000..1e5ec45e2335b
--- /dev/null
+++ b/ci-operator/step-registry/origin/e2e-aws-sdn-single/OWNERS
@@ -0,0 +1,14 @@
+approvers:
+- danwinship
+- dcbw
+- knobunc
+- pecameron
+- squeed
+reviewers:
+- alexanderconstantinescu
+- danwinship
+- dcbw
+- jacobtanenbaum
+- pecameron
+- rcarrillocruz
+- squeed
diff --git a/ci-operator/step-registry/origin/e2e-aws-sdn-single/origin-e2e-aws-sdn-single-workflow.yaml b/ci-operator/step-registry/origin/e2e-aws-sdn-single/origin-e2e-aws-sdn-single-workflow.yaml
new file mode 100644
index 0000000000000..deb2ee6da8032
--- /dev/null
+++ b/ci-operator/step-registry/origin/e2e-aws-sdn-single/origin-e2e-aws-sdn-single-workflow.yaml
@@ -0,0 +1,14 @@
+workflow:
+  as: origin-e2e-aws-sdn-single
+  steps:
+    pre:
+    - chain: ipi-conf-aws
+    - ref: sdn-conf
+    - ref: sdn-conf-single-manifest
+    - chain: ipi-install
+    test:
+    - ref: origin-e2e-test
+    post:
+    - chain: ipi-deprovision
+  documentation: |-
+    The Origin E2E SDN single workflow executes the common end-to-end test suite with the OpenShiftSDN single tenant network plugin.
diff --git a/ci-operator/step-registry/sdn/OWNERS b/ci-operator/step-registry/sdn/OWNERS
new file mode 100644
index 0000000000000..1e5ec45e2335b
--- /dev/null
+++ b/ci-operator/step-registry/sdn/OWNERS
@@ -0,0 +1,14 @@
+approvers:
+- danwinship
+- dcbw
+- knobunc
+- pecameron
+- squeed
+reviewers:
+- alexanderconstantinescu
+- danwinship
+- dcbw
+- jacobtanenbaum
+- pecameron
+- rcarrillocruz
+- squeed
diff --git a/ci-operator/step-registry/sdn/conf/OWNERS b/ci-operator/step-registry/sdn/conf/OWNERS
new file mode 100644
index 0000000000000..be184d722919e
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/OWNERS
@@ -0,0 +1,15 @@
+approvers:
+- danwinship
+- dcbw
+- knobunc
+- pecameron
+- squeed
+options: {}
+reviewers:
+- alexanderconstantinescu
+- danwinship
+- dcbw
+- jacobtanenbaum
+- pecameron
+- rcarrillocruz
+- squeed
diff --git a/ci-operator/step-registry/sdn/conf/multi-manifest/OWNERS b/ci-operator/step-registry/sdn/conf/multi-manifest/OWNERS
new file mode 100644
index 0000000000000..1e5ec45e2335b
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/multi-manifest/OWNERS
@@ -0,0 +1,14 @@
+approvers:
+- danwinship
+- dcbw
+- knobunc
+- pecameron
+- squeed
+reviewers:
+- alexanderconstantinescu
+- danwinship
+- dcbw
+- jacobtanenbaum
+- pecameron
+- rcarrillocruz
+- squeed
diff --git a/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-commands.sh b/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-commands.sh
new file mode 100644
index 0000000000000..07cc22d35f04a
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-commands.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cat > "${SHARED_DIR}/manifest_cluster-network-03-config.yml" << EOF
+apiVersion: config.openshift.io/v1
+kind: Network
+metadata:
+  name: cluster
+spec:
+  serviceNetwork:
+  - "172.30.0.0/16"
+  clusterNetwork:
+  - cidr: "10.128.0.0/14"
+    hostPrefix: 23
+  networkType: OpenShiftSDN
+  openshiftSDNConfig:
+    mode: Multitenant
+    vxlanPort: 4789
+    enableUnidling: true
+    useExternalOpenvswitch: false
+EOF
diff --git a/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml b/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml
new file mode 100644
index 0000000000000..55c4cd9cb8417
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml
@@ -0,0 +1,10 @@
+ref:
+  as: sdn-conf-multi-manifest
+  from: base
+  commands: sdn-conf-multi-manifest-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+          The SDN multi-manifest step adds the configuration for SDN multi-tenant networking to set of manifests for installation.  The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install-install.
diff --git a/ci-operator/step-registry/sdn/conf/sdn-conf-commands.sh b/ci-operator/step-registry/sdn/conf/sdn-conf-commands.sh
new file mode 100644
index 0000000000000..da4474df6649f
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/sdn-conf-commands.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cat >> "${SHARED_DIR}/install-config.yaml" << EOF
+networking:
+  networkType: OpenShiftSDN
+EOF
diff --git a/ci-operator/step-registry/sdn/conf/sdn-conf-ref.yaml b/ci-operator/step-registry/sdn/conf/sdn-conf-ref.yaml
new file mode 100644
index 0000000000000..da7bb5a0bfcd7
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/sdn-conf-ref.yaml
@@ -0,0 +1,10 @@
+ref:
+  as: sdn-conf
+  from: base
+  commands: sdn-conf-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+    The sdn configure step sets the networkType to OpenShiftSDN in the install-config.yaml
diff --git a/ci-operator/step-registry/sdn/conf/single-manifest/OWNERS b/ci-operator/step-registry/sdn/conf/single-manifest/OWNERS
new file mode 100644
index 0000000000000..1e5ec45e2335b
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/single-manifest/OWNERS
@@ -0,0 +1,14 @@
+approvers:
+- danwinship
+- dcbw
+- knobunc
+- pecameron
+- squeed
+reviewers:
+- alexanderconstantinescu
+- danwinship
+- dcbw
+- jacobtanenbaum
+- pecameron
+- rcarrillocruz
+- squeed
diff --git a/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-commands.sh b/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-commands.sh
new file mode 100644
index 0000000000000..53903bca687b7
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-commands.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cat > "${SHARED_DIR}/manifest_cluster-network-03-config.yml" << EOF
+apiVersion: config.openshift.io/v1
+kind: Network
+metadata:
+  name: cluster
+spec:
+  serviceNetwork:
+  - "172.30.0.0/16"
+  clusterNetwork:
+  - cidr: "10.128.0.0/14"
+    hostPrefix: 23
+  networkType: OpenShiftSDN
+  openshiftSDNConfig:
+    mode: Subnet
+    vxlanPort: 4789
+    enableUnidling: true
+    useExternalOpenvswitch: false
+EOF
diff --git a/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml b/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml
new file mode 100644
index 0000000000000..de4e7be7ca244
--- /dev/null
+++ b/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml
@@ -0,0 +1,10 @@
+ref:
+  as: sdn-conf-single-manifest
+  from: base
+  commands: sdn-conf-single-manifest-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+    The SDN single-manifest step adds the configuration for SDN single-tenant networking to set of manifests for installation. The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install-install.