diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml
deleted file mode 100644
index 8ad6ba857f464..0000000000000
--- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml
+++ /dev/null
@@ -1,399 +0,0 @@
-base_images:
-  base:
-    name: "4.10"
-    namespace: ocp
-    tag: base
-binary_build_commands: make install
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-canonical_go_repository: knative.dev/serving
-images:
-- dockerfile_path: openshift/ci-operator/knative-images/activator/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/activator
-  to: knative-serving-activator
-- dockerfile_path: openshift/ci-operator/knative-images/autoscaler/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/autoscaler
-  to: knative-serving-autoscaler
-- dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/autoscaler-hpa
-  to: knative-serving-autoscaler-hpa
-- dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/controller
-  to: knative-serving-controller
-- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/domain-mapping
-  to: knative-serving-domain-mapping
-- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping-webhook/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/domain-mapping-webhook
-  to: knative-serving-domain-mapping-webhook
-- dockerfile_path: openshift/ci-operator/knative-images/migrate/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/migrate
-  to: knative-serving-storage-version-migration
-- 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/webhook/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/webhook
-  to: knative-serving-webhook
-- dockerfile_path: openshift/ci-operator/knative-test-images/autoscale/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/failing/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/grpc-ping/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/hellohttp2/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/hellohttp2
-  to: knative-serving-test-hellohttp2
-- dockerfile_path: openshift/ci-operator/knative-test-images/hellovolume/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/helloworld/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/httpproxy/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/httpproxy
-  to: knative-serving-test-httpproxy
-- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv1/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/pizzaplanetv2/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/readiness/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/readiness
-  to: knative-serving-test-readiness
-- dockerfile_path: openshift/ci-operator/knative-test-images/runtime/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/servingcontainer/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/servingcontainer
-  to: knative-serving-test-servingcontainer
-- dockerfile_path: openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/sidecarcontainer
-  to: knative-serving-test-sidecarcontainer
-- dockerfile_path: openshift/ci-operator/knative-test-images/singlethreaded/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/timeout/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/timeout
-  to: knative-serving-test-timeout
-- dockerfile_path: openshift/ci-operator/knative-test-images/volumes/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/volumes
-  to: knative-serving-test-volumes
-- dockerfile_path: openshift/ci-operator/knative-test-images/wsserver/Dockerfile
-  from: base
-  inputs:
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/wsserver
-  to: knative-serving-test-wsserver
-promotion:
-  additional_images:
-    knative-serving-src: src
-  disabled: true
-  name: knative-nightly
-  namespace: openshift
-releases:
-  initial:
-    integration:
-      name: "4.10"
-      namespace: ocp
-  latest:
-    integration:
-      include_built_images: true
-      name: "4.10"
-      namespace: ocp
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 500m
-      memory: 4Gi
-  bin:
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 500m
-      memory: 4Gi
-test_binary_build_commands: make test-install
-tests:
-- as: e2e-aws-ocp-410
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.10"
-  steps:
-    test:
-    - as: test
-      cli: latest
-      commands: make test-e2e
-      dependencies:
-      - env: KNATIVE_SERVING_ACTIVATOR
-        name: knative-serving-activator
-      - env: KNATIVE_SERVING_AUTOSCALER
-        name: knative-serving-autoscaler
-      - env: KNATIVE_SERVING_AUTOSCALER_HPA
-        name: knative-serving-autoscaler-hpa
-      - env: KNATIVE_SERVING_CONTROLLER
-        name: knative-serving-controller
-      - env: KNATIVE_SERVING_DOMAIN_MAPPING
-        name: knative-serving-domain-mapping
-      - env: KNATIVE_SERVING_DOMAIN_MAPPING_WEBHOOK
-        name: knative-serving-domain-mapping-webhook
-      - env: KNATIVE_SERVING_STORAGE_VERSION_MIGRATION
-        name: knative-serving-storage-version-migration
-      - env: KNATIVE_SERVING_QUEUE
-        name: knative-serving-queue
-      - env: KNATIVE_SERVING_WEBHOOK
-        name: knative-serving-webhook
-      - env: KNATIVE_SERVING_TEST_AUTOSCALE
-        name: knative-serving-test-autoscale
-      - env: KNATIVE_SERVING_TEST_FAILING
-        name: knative-serving-test-failing
-      - env: KNATIVE_SERVING_TEST_GRPC_PING
-        name: knative-serving-test-grpc-ping
-      - env: KNATIVE_SERVING_TEST_HELLOHTTP2
-        name: knative-serving-test-hellohttp2
-      - env: KNATIVE_SERVING_TEST_HELLOVOLUME
-        name: knative-serving-test-hellovolume
-      - env: KNATIVE_SERVING_TEST_HELLOWORLD
-        name: knative-serving-test-helloworld
-      - env: KNATIVE_SERVING_TEST_HTTPPROXY
-        name: knative-serving-test-httpproxy
-      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV1
-        name: knative-serving-test-pizzaplanetv1
-      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV2
-        name: knative-serving-test-pizzaplanetv2
-      - env: KNATIVE_SERVING_TEST_READINESS
-        name: knative-serving-test-readiness
-      - env: KNATIVE_SERVING_TEST_RUNTIME
-        name: knative-serving-test-runtime
-      - env: KNATIVE_SERVING_TEST_SERVINGCONTAINER
-        name: knative-serving-test-servingcontainer
-      - env: KNATIVE_SERVING_TEST_SIDECARCONTAINER
-        name: knative-serving-test-sidecarcontainer
-      - env: KNATIVE_SERVING_TEST_SINGLETHREADED
-        name: knative-serving-test-singlethreaded
-      - env: KNATIVE_SERVING_TEST_TIMEOUT
-        name: knative-serving-test-timeout
-      - env: KNATIVE_SERVING_TEST_VOLUMES
-        name: knative-serving-test-volumes
-      - env: KNATIVE_SERVING_TEST_WSSERVER
-        name: knative-serving-test-wsserver
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 4h0m0s
-    workflow: generic-claim
-- as: e2e-aws-ocp-410-continuous
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.10"
-  steps:
-    test:
-    - as: test
-      cli: latest
-      commands: make test-e2e-tls
-      dependencies:
-      - env: KNATIVE_SERVING_ACTIVATOR
-        name: knative-serving-activator
-      - env: KNATIVE_SERVING_AUTOSCALER
-        name: knative-serving-autoscaler
-      - env: KNATIVE_SERVING_AUTOSCALER_HPA
-        name: knative-serving-autoscaler-hpa
-      - env: KNATIVE_SERVING_CONTROLLER
-        name: knative-serving-controller
-      - env: KNATIVE_SERVING_DOMAIN_MAPPING
-        name: knative-serving-domain-mapping
-      - env: KNATIVE_SERVING_DOMAIN_MAPPING_WEBHOOK
-        name: knative-serving-domain-mapping-webhook
-      - env: KNATIVE_SERVING_STORAGE_VERSION_MIGRATION
-        name: knative-serving-storage-version-migration
-      - env: KNATIVE_SERVING_QUEUE
-        name: knative-serving-queue
-      - env: KNATIVE_SERVING_WEBHOOK
-        name: knative-serving-webhook
-      - env: KNATIVE_SERVING_TEST_AUTOSCALE
-        name: knative-serving-test-autoscale
-      - env: KNATIVE_SERVING_TEST_FAILING
-        name: knative-serving-test-failing
-      - env: KNATIVE_SERVING_TEST_GRPC_PING
-        name: knative-serving-test-grpc-ping
-      - env: KNATIVE_SERVING_TEST_HELLOHTTP2
-        name: knative-serving-test-hellohttp2
-      - env: KNATIVE_SERVING_TEST_HELLOVOLUME
-        name: knative-serving-test-hellovolume
-      - env: KNATIVE_SERVING_TEST_HELLOWORLD
-        name: knative-serving-test-helloworld
-      - env: KNATIVE_SERVING_TEST_HTTPPROXY
-        name: knative-serving-test-httpproxy
-      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV1
-        name: knative-serving-test-pizzaplanetv1
-      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV2
-        name: knative-serving-test-pizzaplanetv2
-      - env: KNATIVE_SERVING_TEST_READINESS
-        name: knative-serving-test-readiness
-      - env: KNATIVE_SERVING_TEST_RUNTIME
-        name: knative-serving-test-runtime
-      - env: KNATIVE_SERVING_TEST_SERVINGCONTAINER
-        name: knative-serving-test-servingcontainer
-      - env: KNATIVE_SERVING_TEST_SIDECARCONTAINER
-        name: knative-serving-test-sidecarcontainer
-      - env: KNATIVE_SERVING_TEST_SINGLETHREADED
-        name: knative-serving-test-singlethreaded
-      - env: KNATIVE_SERVING_TEST_TIMEOUT
-        name: knative-serving-test-timeout
-      - env: KNATIVE_SERVING_TEST_VOLUMES
-        name: knative-serving-test-volumes
-      - env: KNATIVE_SERVING_TEST_WSSERVER
-        name: knative-serving-test-wsserver
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 4h0m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-next
-  org: openshift
-  repo: knative-serving
-  variant: 410-tls
diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml
index c18a0272ab650..8b74bb4e8d44d 100644
--- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml
+++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml
@@ -319,6 +319,78 @@ tests:
           cpu: 100m
       timeout: 4h0m0s
     workflow: generic-claim
+- as: e2e-aws-ocp-tls-411
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: openshift-ci
+    product: ocp
+    timeout: 1h0m0s
+    version: "4.11"
+  steps:
+    test:
+    - as: test
+      cli: latest
+      commands: make test-e2e-tls
+      dependencies:
+      - env: KNATIVE_SERVING_ACTIVATOR
+        name: knative-serving-activator
+      - env: KNATIVE_SERVING_AUTOSCALER
+        name: knative-serving-autoscaler
+      - env: KNATIVE_SERVING_AUTOSCALER_HPA
+        name: knative-serving-autoscaler-hpa
+      - env: KNATIVE_SERVING_CONTROLLER
+        name: knative-serving-controller
+      - env: KNATIVE_SERVING_DOMAIN_MAPPING
+        name: knative-serving-domain-mapping
+      - env: KNATIVE_SERVING_DOMAIN_MAPPING_WEBHOOK
+        name: knative-serving-domain-mapping-webhook
+      - env: KNATIVE_SERVING_STORAGE_VERSION_MIGRATION
+        name: knative-serving-storage-version-migration
+      - env: KNATIVE_SERVING_QUEUE
+        name: knative-serving-queue
+      - env: KNATIVE_SERVING_WEBHOOK
+        name: knative-serving-webhook
+      - env: KNATIVE_SERVING_TEST_AUTOSCALE
+        name: knative-serving-test-autoscale
+      - env: KNATIVE_SERVING_TEST_FAILING
+        name: knative-serving-test-failing
+      - env: KNATIVE_SERVING_TEST_GRPC_PING
+        name: knative-serving-test-grpc-ping
+      - env: KNATIVE_SERVING_TEST_HELLOHTTP2
+        name: knative-serving-test-hellohttp2
+      - env: KNATIVE_SERVING_TEST_HELLOVOLUME
+        name: knative-serving-test-hellovolume
+      - env: KNATIVE_SERVING_TEST_HELLOWORLD
+        name: knative-serving-test-helloworld
+      - env: KNATIVE_SERVING_TEST_HTTPPROXY
+        name: knative-serving-test-httpproxy
+      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV1
+        name: knative-serving-test-pizzaplanetv1
+      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV2
+        name: knative-serving-test-pizzaplanetv2
+      - env: KNATIVE_SERVING_TEST_READINESS
+        name: knative-serving-test-readiness
+      - env: KNATIVE_SERVING_TEST_RUNTIME
+        name: knative-serving-test-runtime
+      - env: KNATIVE_SERVING_TEST_SERVINGCONTAINER
+        name: knative-serving-test-servingcontainer
+      - env: KNATIVE_SERVING_TEST_SIDECARCONTAINER
+        name: knative-serving-test-sidecarcontainer
+      - env: KNATIVE_SERVING_TEST_SINGLETHREADED
+        name: knative-serving-test-singlethreaded
+      - env: KNATIVE_SERVING_TEST_TIMEOUT
+        name: knative-serving-test-timeout
+      - env: KNATIVE_SERVING_TEST_VOLUMES
+        name: knative-serving-test-volumes
+      - env: KNATIVE_SERVING_TEST_WSSERVER
+        name: knative-serving-test-wsserver
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+      timeout: 4h0m0s
+    workflow: generic-claim
 zz_generated_metadata:
   branch: release-next
   org: openshift
diff --git a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml
index 87f47235ea4a9..5556cd6e88fe7 100644
--- a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml
@@ -1,63 +1,5 @@
 postsubmits:
   openshift/knative-serving:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-next$
-    cluster: build02
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci-operator.openshift.io/variant: 410-tls
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-serving-release-next-410-tls-images
-    path_alias: knative.dev/serving
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        - --target=src
-        - --variant=410-tls
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
   - agent: kubernetes
     always_run: true
     branches:
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 95b118c560f4d..df01497f765c6 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
@@ -6,83 +6,17 @@ presubmits:
     - ^release-next$
     - ^release-next-
     cluster: build03
-    context: ci/prow/410-tls-e2e-aws-ocp-410
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/variant: 410-tls
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-serving-release-next-410-tls-e2e-aws-ocp-410
-    path_alias: knative.dev/serving
-    rerun_command: /test 410-tls-e2e-aws-ocp-410
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-ocp-410
-        - --variant=410-tls
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )410-tls-e2e-aws-ocp-410,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-next$
-    - ^release-next-
-    cluster: build03
-    context: ci/prow/410-tls-e2e-aws-ocp-410-continuous
+    context: ci/prow/411-e2e-aws-ocp-411
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/variant: 410-tls
+      ci-operator.openshift.io/variant: "411"
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-serving-release-next-410-tls-e2e-aws-ocp-410-continuous
+    name: pull-ci-openshift-knative-serving-release-next-411-e2e-aws-ocp-411
     path_alias: knative.dev/serving
-    rerun_command: /test 410-tls-e2e-aws-ocp-410-continuous
+    rerun_command: /test 411-e2e-aws-ocp-411
     spec:
       containers:
       - args:
@@ -91,8 +25,8 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-ocp-410-continuous
-        - --variant=410-tls
+        - --target=e2e-aws-ocp-411
+        - --variant=411
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,67 +65,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )410-tls-e2e-aws-ocp-410-continuous,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-next$
-    - ^release-next-
-    cluster: build03
-    context: ci/prow/410-tls-images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/variant: 410-tls
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-serving-release-next-410-tls-images
-    path_alias: knative.dev/serving
-    rerun_command: /test 410-tls-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        - --target=src
-        - --variant=410-tls
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )410-tls-images,?($|\s.*)
+    trigger: (?m)^/test( | .* )411-e2e-aws-ocp-411,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-next$
     - ^release-next-
     cluster: build03
-    context: ci/prow/411-e2e-aws-ocp-411
+    context: ci/prow/411-e2e-aws-ocp-tls-411
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -199,9 +80,9 @@ presubmits:
       ci-operator.openshift.io/variant: "411"
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-serving-release-next-411-e2e-aws-ocp-411
+    name: pull-ci-openshift-knative-serving-release-next-411-e2e-aws-ocp-tls-411
     path_alias: knative.dev/serving
-    rerun_command: /test 411-e2e-aws-ocp-411
+    rerun_command: /test 411-e2e-aws-ocp-tls-411
     spec:
       containers:
       - args:
@@ -210,7 +91,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-ocp-411
+        - --target=e2e-aws-ocp-tls-411
         - --variant=411
         command:
         - ci-operator
@@ -250,7 +131,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )411-e2e-aws-ocp-411,?($|\s.*)
+    trigger: (?m)^/test( | .* )411-e2e-aws-ocp-tls-411,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: