diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__vsphere.yaml
similarity index 94%
rename from ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml
rename to ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__vsphere.yaml
index 630c07bd853f4..b166a990d13b1 100644
--- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-v0.8.1__vsphere.yaml
+++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__vsphere.yaml
@@ -15,8 +15,8 @@ test_binary_build_commands: make test-install
 tests:
 - as: e2e-vsphere-ocp-42
   commands: "make test-e2e"
-  cron: '@daily'
-  openshift_installer_upi:
+#  cron: '@daily' // reenable this after job has been successfully setup.
+  openshift_installer_upi_src:
     cluster_profile: vsphere
 resources:
   '*':
@@ -26,14 +26,14 @@ resources:
       cpu: 100m
       memory: 200Mi
 images:
-- dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/autoscaler-hpa
-  to: knative-serving-autoscaler-hpa
+        source_path: /go/bin/webhook
+  to: knative-serving-webhook
 - dockerfile_path: openshift/ci-operator/knative-images/activator/Dockerfile
   from: base
   inputs:
@@ -50,38 +50,46 @@ images:
       - destination_dir: .
         source_path: /go/bin/istio
   to: knative-serving-istio
-- dockerfile_path: openshift/ci-operator/knative-images/queue/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-images/nscert/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/queue
-  to: knative-serving-queue
-- dockerfile_path: openshift/ci-operator/knative-images/certmanager/Dockerfile
+        source_path: /go/bin/nscert
+  to: knative-serving-nscert
+- dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/certmanager
-  to: knative-serving-certmanager
-- dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile
+        source_path: /go/bin/controller
+  to: knative-serving-controller
+- dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/webhook
-  to: knative-serving-webhook
-- dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile
+        source_path: /go/bin/autoscaler-hpa
+  to: knative-serving-autoscaler-hpa
+- dockerfile_path: openshift/ci-operator/knative-images/certmanager/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/controller
-  to: knative-serving-controller
+        source_path: /go/bin/certmanager
+  to: knative-serving-certmanager
+- dockerfile_path: openshift/ci-operator/knative-images/queue/Dockerfile
+  from: base
+  inputs:
+    bin:
+      paths:
+      - destination_dir: .
+        source_path: /go/bin/queue
+  to: knative-serving-queue
 - dockerfile_path: openshift/ci-operator/knative-images/autoscaler/Dockerfile
   from: base
   inputs:
@@ -90,86 +98,86 @@ images:
       - destination_dir: .
         source_path: /go/bin/autoscaler
   to: knative-serving-autoscaler
-- dockerfile_path: openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/grpc-ping
-  to: knative-serving-test-grpc-ping
-- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile
+        source_path: /go/bin/pizzaplanetv2
+  to: knative-serving-test-pizzaplanetv2
+- dockerfile_path: openshift/ci-operator/knative-test-images/helloworld/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/pizzaplanetv1
-  to: knative-serving-test-pizzaplanetv1
-- dockerfile_path: openshift/ci-operator/knative-test-images/hellovolume/Dockerfile
+        source_path: /go/bin/helloworld
+  to: knative-serving-test-helloworld
+- dockerfile_path: openshift/ci-operator/knative-test-images/runtime/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/hellovolume
-  to: knative-serving-test-hellovolume
-- dockerfile_path: openshift/ci-operator/knative-test-images/runtime/Dockerfile
+        source_path: /go/bin/runtime
+  to: knative-serving-test-runtime
+- dockerfile_path: openshift/ci-operator/knative-test-images/timeout/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/runtime
-  to: knative-serving-test-runtime
-- dockerfile_path: openshift/ci-operator/knative-test-images/failing/Dockerfile
+        source_path: /go/bin/timeout
+  to: knative-serving-test-timeout
+- dockerfile_path: openshift/ci-operator/knative-test-images/observed-concurrency/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/failing
-  to: knative-serving-test-failing
-- dockerfile_path: openshift/ci-operator/knative-test-images/wsserver/Dockerfile
+        source_path: /go/bin/observed-concurrency
+  to: knative-serving-test-observed-concurrency
+- dockerfile_path: openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/wsserver
-  to: knative-serving-test-wsserver
-- dockerfile_path: openshift/ci-operator/knative-test-images/autoscale/Dockerfile
+        source_path: /go/bin/grpc-ping
+  to: knative-serving-test-grpc-ping
+- dockerfile_path: openshift/ci-operator/knative-test-images/failing/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/autoscale
-  to: knative-serving-test-autoscale
-- dockerfile_path: openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile
+        source_path: /go/bin/failing
+  to: knative-serving-test-failing
+- dockerfile_path: openshift/ci-operator/knative-test-images/autoscale/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/singlethreaded
-  to: knative-serving-test-singlethreaded
-- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile
+        source_path: /go/bin/autoscale
+  to: knative-serving-test-autoscale
+- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/pizzaplanetv2
-  to: knative-serving-test-pizzaplanetv2
-- dockerfile_path: openshift/ci-operator/knative-test-images/timeout/Dockerfile
+        source_path: /go/bin/pizzaplanetv1
+  to: knative-serving-test-pizzaplanetv1
+- dockerfile_path: openshift/ci-operator/knative-test-images/wsserver/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/timeout
-  to: knative-serving-test-timeout
+        source_path: /go/bin/wsserver
+  to: knative-serving-test-wsserver
 - dockerfile_path: openshift/ci-operator/knative-test-images/httpproxy/Dockerfile
   from: base
   inputs:
@@ -178,19 +186,19 @@ images:
       - destination_dir: .
         source_path: /go/bin/httpproxy
   to: knative-serving-test-httpproxy
-- dockerfile_path: openshift/ci-operator/knative-test-images/helloworld/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/helloworld
-  to: knative-serving-test-helloworld
-- dockerfile_path: openshift/ci-operator/knative-test-images/observed-concurrency/Dockerfile
+        source_path: /go/bin/singlethreaded
+  to: knative-serving-test-singlethreaded
+- dockerfile_path: openshift/ci-operator/knative-test-images/hellovolume/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/observed-concurrency
-  to: knative-serving-test-observed-concurrency
+        source_path: /go/bin/hellovolume
+  to: knative-serving-test-hellovolume
diff --git a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml
index baa9e9eca100c..cbe29cb82ef05 100644
--- a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml
+++ b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml
@@ -119,3 +119,126 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-next
+    context: ci/prow/vsphere-e2e-vsphere-ocp-42
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      ci-operator.openshift.io/variant: vsphere
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-knative-serving-release-next-vsphere-e2e-vsphere-ocp-42
+    path_alias: knative.dev/serving
+    rerun_command: /test vsphere-e2e-vsphere-ocp-42
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-next
+        - --give-pr-author-access-to-namespace=true
+        - --org=openshift
+        - --repo=knative-serving
+        - --resolver-address=http://ci-operator-configresolver
+        - --secret-dir=/usr/local/e2e-vsphere-ocp-42-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-vsphere-ocp-42
+        - --template=/usr/local/e2e-vsphere-ocp-42
+        - --variant=vsphere
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: vsphere
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-knative-serving-release-next__vsphere.yaml
+              name: ci-operator-misc-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-vsphere-ocp-42
+        - name: TEST_COMMAND
+          value: make test-e2e
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/e2e-vsphere-ocp-42-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-vsphere-ocp-42
+          name: job-definition
+          subPath: cluster-launch-installer-upi-src.yaml
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-vsphere
+      - configMap:
+          name: prow-job-cluster-launch-installer-upi-src
+        name: job-definition
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )vsphere-e2e-vsphere-ocp-42,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-next
+    context: ci/prow/vsphere-images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      ci-operator.openshift.io/variant: vsphere
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-knative-serving-release-next-vsphere-images
+    path_alias: knative.dev/serving
+    rerun_command: /test vsphere-images
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-next
+        - --give-pr-author-access-to-namespace=true
+        - --org=openshift
+        - --repo=knative-serving
+        - --resolver-address=http://ci-operator-configresolver
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=[images]
+        - --variant=vsphere
+        command:
+        - ci-operator
+        env:
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-knative-serving-release-next__vsphere.yaml
+              name: ci-operator-misc-configs
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )vsphere-images,?($|\s.*)
diff --git a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-periodics.yaml b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-periodics.yaml
deleted file mode 100644
index 68260ae5a2502..0000000000000
--- a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-periodics.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-periodics:
-- agent: kubernetes
-  cron: '@daily'
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-v0.8.1
-    org: openshift
-    path_alias: knative.dev/serving
-    repo: knative-serving
-  labels:
-    ci-operator.openshift.io/prowgen-controlled: "true"
-    ci-operator.openshift.io/variant: vsphere
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-knative-serving-release-v0.8.1-vsphere-e2e-vsphere-ocp-42
-  spec:
-    containers:
-    - args:
-      - --artifact-dir=$(ARTIFACTS)
-      - --branch=release-v0.8.1
-      - --give-pr-author-access-to-namespace=true
-      - --org=openshift
-      - --repo=knative-serving
-      - --resolver-address=http://ci-operator-configresolver
-      - --secret-dir=/usr/local/e2e-vsphere-ocp-42-cluster-profile
-      - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-      - --target=e2e-vsphere-ocp-42
-      - --template=/usr/local/e2e-vsphere-ocp-42
-      - --variant=vsphere
-      command:
-      - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: vsphere
-      - name: CONFIG_SPEC
-        valueFrom:
-          configMapKeyRef:
-            key: openshift-knative-serving-release-v0.8.1__vsphere.yaml
-            name: ci-operator-misc-configs
-      - name: JOB_NAME_SAFE
-        value: e2e-vsphere-ocp-42
-      - name: TEST_COMMAND
-        value: make test-e2e
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /usr/local/e2e-vsphere-ocp-42-cluster-profile
-        name: cluster-profile
-      - mountPath: /usr/local/e2e-vsphere-ocp-42
-        name: job-definition
-        subPath: cluster-launch-installer-upi-e2e.yaml
-      - mountPath: /etc/sentry-dsn
-        name: sentry-dsn
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-vsphere
-    - configMap:
-        name: prow-job-cluster-launch-installer-upi-e2e
-      name: job-definition
-    - name: sentry-dsn
-      secret:
-        secretName: sentry-dsn
diff --git a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-presubmits.yaml b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-presubmits.yaml
index 296be8daf0340..0f1c5fde9fdc2 100644
--- a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-v0.8.1-presubmits.yaml
@@ -242,54 +242,3 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )variant-images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-v0.8.1
-    context: ci/prow/vsphere-images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      ci-operator.openshift.io/variant: vsphere
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-serving-release-v0.8.1-vsphere-images
-    path_alias: knative.dev/serving
-    rerun_command: /test vsphere-images
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-v0.8.1
-        - --give-pr-author-access-to-namespace=true
-        - --org=openshift
-        - --repo=knative-serving
-        - --resolver-address=http://ci-operator-configresolver
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=[images]
-        - --variant=vsphere
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-knative-serving-release-v0.8.1__vsphere.yaml
-              name: ci-operator-misc-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )vsphere-images,?($|\s.*)