diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/OWNERS b/ci-operator/config/openshift-knative/kn-plugin-event/OWNERS
index 164dd3e5138c..d306a2792d61 100644
--- a/ci-operator/config/openshift-knative/kn-plugin-event/OWNERS
+++ b/ci-operator/config/openshift-knative/kn-plugin-event/OWNERS
@@ -10,9 +10,8 @@ approvers:
 - mgencur
 - openshift-cherrypick-robot
 - rhuss
+- cardil
 options: {}
 reviewers:
-- cardil
 - jrangelramos
-- lance
 - matejvasek
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26.yaml
deleted file mode 100644
index b8412855a2f5..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |
-  go build -race -o /usr/bin/kn-event-sender ./cmd/kn-event-sender
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_literal: |-
-    FROM base
-    ADD kn-event-sender /usr/bin/kn-event-sender
-    ENTRYPOINT ["/usr/bin/kn-event-sender"]
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-promotion:
-  to:
-  - name: release-0.26
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.9"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-zz_generated_metadata:
-  branch: release-0.26
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1.yaml
deleted file mode 100644
index 4cf923b42c08..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.1
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.10"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-410
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.10"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.1
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10.yaml
similarity index 94%
rename from ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3.yaml
rename to ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10.yaml
index 1c0be3ee6456..650c9fefe846 100644
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3.yaml
+++ b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10.yaml
@@ -37,13 +37,13 @@ images:
   to: client-plugin-event-test-wathola-forwarder
 promotion:
   to:
-  - name: release-1.3
+  - name: release-1.10
     namespace: knative
 releases:
   latest:
     release:
       channel: fast
-      version: "4.10"
+      version: "4.14"
 resources:
   '*':
     limits:
@@ -58,14 +58,14 @@ tests:
     ./mage test
   container:
     from: src
-- as: e2e-aws-ocp-410
+- as: e2e-aws-ocp-414
   cluster_claim:
     architecture: amd64
     cloud: aws
     owner: openshift-ci
     product: ocp
     timeout: 1h30m0s
-    version: "4.10"
+    version: "4.14"
   steps:
     test:
     - as: test
@@ -84,6 +84,6 @@ tests:
       timeout: 30m0s
     workflow: generic-claim
 zz_generated_metadata:
-  branch: release-1.3
+  branch: release-1.10
   org: openshift-knative
   repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11.yaml
similarity index 92%
rename from ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0.yaml
rename to ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11.yaml
index c8f3e9bf0745..806be82b0a43 100644
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0.yaml
+++ b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11.yaml
@@ -37,13 +37,13 @@ images:
   to: client-plugin-event-test-wathola-forwarder
 promotion:
   to:
-  - name: release-1.0
+  - name: release-1.11
     namespace: knative
 releases:
   latest:
     release:
       channel: fast
-      version: "4.9"
+      version: "4.15"
 resources:
   '*':
     limits:
@@ -58,14 +58,14 @@ tests:
     ./mage test
   container:
     from: src
-- as: e2e-aws-ocp-49
+- as: e2e-aws-ocp-415
   cluster_claim:
     architecture: amd64
     cloud: aws
-    owner: openshift-ci
+    owner: serverless-ci
     product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
+    timeout: 1h0m0s
+    version: "4.15"
   steps:
     test:
     - as: test
@@ -84,6 +84,6 @@ tests:
       timeout: 30m0s
     workflow: generic-claim
 zz_generated_metadata:
-  branch: release-1.0
+  branch: release-1.11
   org: openshift-knative
   repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2.yaml
deleted file mode 100644
index 9c648c2477a2..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.2
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.10"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-410
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.10"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.2
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4.yaml
deleted file mode 100644
index 456a7c940a27..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.4
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.10"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-410
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.10"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.4
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5.yaml
deleted file mode 100644
index f10fbade6288..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.5
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.11"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-411
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.11"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.5
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6.yaml
deleted file mode 100644
index 2835fcf65de6..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.6
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.11"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-411
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.11"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.6
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7.yaml
deleted file mode 100644
index 438cdb944aac..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.7
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.11"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-411
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.11"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.7
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8.yaml
deleted file mode 100644
index 35f53af23c41..000000000000
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-base_images:
-  base:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-binary_build_commands: |-
-  export HOME=/tmp
-  export TEST_IMAGES_DIR=/usr/bin
-  ./mage build
-build_root:
-  project_image:
-    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
-images:
-- dockerfile_path: openshift/ci-operator/images/kn-event-sender/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/kn-event-sender
-  to: client-plugin-event-sender
-- dockerfile_path: openshift/ci-operator/test-images/eventshub/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/eventshub
-  to: client-plugin-event-test-eventshub
-- dockerfile_path: openshift/ci-operator/test-images/wathola-forwarder/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/wathola-forwarder
-  to: client-plugin-event-test-wathola-forwarder
-promotion:
-  to:
-  - name: release-1.8
-    namespace: knative
-releases:
-  latest:
-    release:
-      channel: fast
-      version: "4.11"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: |
-    export HOME=/tmp
-    ./mage test
-  container:
-    from: src
-- as: e2e-aws-ocp-411
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.11"
-  steps:
-    test:
-    - as: test
-      commands: openshift/e2e-tests.sh
-      dependencies:
-      - env: TEST_IMAGES_EVENTSHUB
-        name: client-plugin-event-test-eventshub
-      - env: TEST_IMAGES_WATHOLA_FORWARDER
-        name: client-plugin-event-test-wathola-forwarder
-      - env: IMAGES_KN_EVENT_SENDER
-        name: client-plugin-event-sender
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 30m0s
-    workflow: generic-claim
-zz_generated_metadata:
-  branch: release-1.8
-  org: openshift-knative
-  repo: kn-plugin-event
diff --git a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next.yaml b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next.yaml
index e57367e1883b..3ccea873988f 100644
--- a/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next.yaml
+++ b/ci-operator/config/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next.yaml
@@ -43,7 +43,7 @@ releases:
   latest:
     release:
       channel: fast
-      version: "4.11"
+      version: "4.15"
 resources:
   '*':
     limits:
@@ -58,14 +58,14 @@ tests:
     ./mage test
   container:
     from: src
-- as: e2e-aws-ocp-411
+- as: e2e-aws-ocp-415
   cluster_claim:
     architecture: amd64
     cloud: aws
-    owner: openshift-ci
+    owner: serverless-ci
     product: ocp
-    timeout: 1h30m0s
-    version: "4.11"
+    timeout: 1h0m0s
+    version: "4.15"
   steps:
     test:
     - as: test
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26-postsubmits.yaml
deleted file mode 100644
index ec28f960bcfe..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-0\.26$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-0.26-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26-presubmits.yaml
deleted file mode 100644
index 23e89e12dece..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-0.26-presubmits.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-0\.26$
-    - ^release-0\.26-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-0.26-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-0\.26$
-    - ^release-0\.26-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-0.26-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0-postsubmits.yaml
deleted file mode 100644
index 14bdc3017d95..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.0$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.0-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1-postsubmits.yaml
deleted file mode 100644
index d1215e846bfe..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.1$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.1-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1-presubmits.yaml
deleted file mode 100644
index f5ec2d7f55f6..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.1-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.1$
-    - ^release-1\.1-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-410
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.1-e2e-aws-ocp-410
-    rerun_command: /test 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
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-410,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.1$
-    - ^release-1\.1-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.1-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.1$
-    - ^release-1\.1-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.1-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10-postsubmits.yaml
similarity index 97%
rename from ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3-postsubmits.yaml
rename to ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10-postsubmits.yaml
index 3162166c4338..a2dba82cb59e 100644
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10-postsubmits.yaml
@@ -3,8 +3,8 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.3$
-    cluster: build04
+    - ^release-1\.10$
+    cluster: build03
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -12,7 +12,7 @@ postsubmits:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.3-images
+    name: branch-ci-openshift-knative-kn-plugin-event-release-1.10-images
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10-presubmits.yaml
similarity index 89%
rename from ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3-presubmits.yaml
rename to ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10-presubmits.yaml
index 0de3db91f4ca..67996632f8a7 100644
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.3-presubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.10-presubmits.yaml
@@ -3,18 +3,18 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.3$
-    - ^release-1\.3-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-410
+    - ^release-1\.10$
+    - ^release-1\.10-
+    cluster: build03
+    context: ci/prow/e2e-aws-ocp-414
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.3-e2e-aws-ocp-410
-    rerun_command: /test e2e-aws-ocp-410
+    name: pull-ci-openshift-knative-kn-plugin-event-release-1.10-e2e-aws-ocp-414
+    rerun_command: /test e2e-aws-ocp-414
     spec:
       containers:
       - args:
@@ -23,7 +23,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-410
+        - --target=e2e-aws-ocp-414
         command:
         - ci-operator
         image: ci-operator:latest
@@ -68,13 +68,13 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-410,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ocp-414,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.3$
-    - ^release-1\.3-
-    cluster: build04
+    - ^release-1\.10$
+    - ^release-1\.10-
+    cluster: build03
     context: ci/prow/images
     decorate: true
     decoration_config:
@@ -82,7 +82,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.3-images
+    name: pull-ci-openshift-knative-kn-plugin-event-release-1.10-images
     rerun_command: /test images
     spec:
       containers:
@@ -127,9 +127,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.3$
-    - ^release-1\.3-
-    cluster: build04
+    - ^release-1\.10$
+    - ^release-1\.10-
+    cluster: build03
     context: ci/prow/unit
     decorate: true
     decoration_config:
@@ -137,7 +137,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.3-unit
+    name: pull-ci-openshift-knative-kn-plugin-event-release-1.10-unit
     rerun_command: /test unit
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11-postsubmits.yaml
similarity index 97%
rename from ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2-postsubmits.yaml
rename to ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11-postsubmits.yaml
index aef6cd11dbd3..c778e9f029cf 100644
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11-postsubmits.yaml
@@ -3,8 +3,8 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.2$
-    cluster: build04
+    - ^release-1\.11$
+    cluster: build03
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -12,7 +12,7 @@ postsubmits:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.2-images
+    name: branch-ci-openshift-knative-kn-plugin-event-release-1.11-images
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11-presubmits.yaml
similarity index 89%
rename from ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0-presubmits.yaml
rename to ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11-presubmits.yaml
index 8808aeaf9b01..94cf0bb8cd2f 100644
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.11-presubmits.yaml
@@ -3,18 +3,18 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.0$
-    - ^release-1\.0-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-49
+    - ^release-1\.11$
+    - ^release-1\.11-
+    cluster: build03
+    context: ci/prow/e2e-aws-ocp-415
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.0-e2e-aws-ocp-49
-    rerun_command: /test e2e-aws-ocp-49
+    name: pull-ci-openshift-knative-kn-plugin-event-release-1.11-e2e-aws-ocp-415
+    rerun_command: /test e2e-aws-ocp-415
     spec:
       containers:
       - args:
@@ -23,7 +23,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-49
+        - --target=e2e-aws-ocp-415
         command:
         - ci-operator
         image: ci-operator:latest
@@ -68,13 +68,13 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-49,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ocp-415,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.0$
-    - ^release-1\.0-
-    cluster: build04
+    - ^release-1\.11$
+    - ^release-1\.11-
+    cluster: build03
     context: ci/prow/images
     decorate: true
     decoration_config:
@@ -82,7 +82,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.0-images
+    name: pull-ci-openshift-knative-kn-plugin-event-release-1.11-images
     rerun_command: /test images
     spec:
       containers:
@@ -127,9 +127,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-1\.0$
-    - ^release-1\.0-
-    cluster: build04
+    - ^release-1\.11$
+    - ^release-1\.11-
+    cluster: build03
     context: ci/prow/unit
     decorate: true
     decoration_config:
@@ -137,7 +137,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.0-unit
+    name: pull-ci-openshift-knative-kn-plugin-event-release-1.11-unit
     rerun_command: /test unit
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2-presubmits.yaml
deleted file mode 100644
index d456b6afc135..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.2-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.2$
-    - ^release-1\.2-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-410
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.2-e2e-aws-ocp-410
-    rerun_command: /test 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
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-410,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.2$
-    - ^release-1\.2-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.2-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.2$
-    - ^release-1\.2-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.2-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4-postsubmits.yaml
deleted file mode 100644
index 3dc53e236ae3..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.4$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.4-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4-presubmits.yaml
deleted file mode 100644
index 90b533782986..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.4-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.4$
-    - ^release-1\.4-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-410
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.4-e2e-aws-ocp-410
-    rerun_command: /test 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
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-410,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.4$
-    - ^release-1\.4-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.4-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.4$
-    - ^release-1\.4-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.4-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5-postsubmits.yaml
deleted file mode 100644
index ef5675b4da2d..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.5$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.5-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5-presubmits.yaml
deleted file mode 100644
index e9b176983e2c..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.5-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.5$
-    - ^release-1\.5-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-411
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.5-e2e-aws-ocp-411
-    rerun_command: /test e2e-aws-ocp-411
-    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-411
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-411,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.5$
-    - ^release-1\.5-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.5-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.5$
-    - ^release-1\.5-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.5-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6-postsubmits.yaml
deleted file mode 100644
index 4acc5abf5e23..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.6$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.6-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6-presubmits.yaml
deleted file mode 100644
index 05b3e0c22773..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.6-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.6$
-    - ^release-1\.6-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-411
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.6-e2e-aws-ocp-411
-    rerun_command: /test e2e-aws-ocp-411
-    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-411
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-411,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.6$
-    - ^release-1\.6-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.6-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.6$
-    - ^release-1\.6-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.6-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7-postsubmits.yaml
deleted file mode 100644
index 5f231be2e73d..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.7$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.7-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7-presubmits.yaml
deleted file mode 100644
index c34c01a8ddce..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.7-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.7$
-    - ^release-1\.7-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-411
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.7-e2e-aws-ocp-411
-    rerun_command: /test e2e-aws-ocp-411
-    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-411
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-411,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.7$
-    - ^release-1\.7-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.7-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.7$
-    - ^release-1\.7-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.7-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8-postsubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8-postsubmits.yaml
deleted file mode 100644
index a87674c3103b..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8-postsubmits.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-postsubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.8$
-    cluster: build04
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-knative-kn-plugin-event-release-1.8-images
-    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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - 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
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8-presubmits.yaml
deleted file mode 100644
index cb1826f63b78..000000000000
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-1.8-presubmits.yaml
+++ /dev/null
@@ -1,181 +0,0 @@
-presubmits:
-  openshift-knative/kn-plugin-event:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.8$
-    - ^release-1\.8-
-    cluster: build04
-    context: ci/prow/e2e-aws-ocp-411
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.8-e2e-aws-ocp-411
-    rerun_command: /test e2e-aws-ocp-411
-    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-411
-        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: /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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-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
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-411,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.8$
-    - ^release-1\.8-
-    cluster: build04
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.8-images
-    rerun_command: /test 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]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-1\.8$
-    - ^release-1\.8-
-    cluster: build04
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-1.8-unit
-    rerun_command: /test unit
-    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=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: 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
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next-presubmits.yaml b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next-presubmits.yaml
index 4f226cd02d40..8e93764dc2ba 100644
--- a/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next-presubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/kn-plugin-event/openshift-knative-kn-plugin-event-release-next-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-next$
     - ^release-next-
     cluster: build04
-    context: ci/prow/e2e-aws-ocp-411
+    context: ci/prow/e2e-aws-ocp-415
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-kn-plugin-event-release-next-e2e-aws-ocp-411
-    rerun_command: /test e2e-aws-ocp-411
+    name: pull-ci-openshift-knative-kn-plugin-event-release-next-e2e-aws-ocp-415
+    rerun_command: /test e2e-aws-ocp-415
     spec:
       containers:
       - args:
@@ -23,7 +23,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-415
         command:
         - ci-operator
         image: ci-operator:latest
@@ -68,7 +68,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ocp-411,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ocp-415,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml
index d29fbbd118a3..80d5bdf90909 100644
--- a/core-services/prow/02_config/_config.yaml
+++ b/core-services/prow/02_config/_config.yaml
@@ -260,10 +260,10 @@ plank:
             memory: 250Mi
       timeout: 4h0m0s
       utility_images:
-        clonerefs: gcr.io/k8s-prow/clonerefs:v20240313-e1b5195aac
-        entrypoint: gcr.io/k8s-prow/entrypoint:v20240313-e1b5195aac
-        initupload: gcr.io/k8s-prow/initupload:v20240313-e1b5195aac
-        sidecar: gcr.io/k8s-prow/sidecar:v20240313-e1b5195aac
+        clonerefs: gcr.io/k8s-prow/clonerefs:v20240306-0b904de3b3
+        entrypoint: gcr.io/k8s-prow/entrypoint:v20240306-0b904de3b3
+        initupload: gcr.io/k8s-prow/initupload:v20240306-0b904de3b3
+        sidecar: gcr.io/k8s-prow/sidecar:v20240306-0b904de3b3
   - config:
       gcs_configuration:
         bucket: origin-ci-private
@@ -284,7 +284,7 @@ plank:
         mediaTypes:
           log: text/plain
       gcs_credentials_secret: gce-sa-credentials-gcs-qe-private-deck
-      timeout: 22h0m0s
+      timeout: 23h0m0s
     repo: openshift/openshift-tests-private
   - config:
       gcs_configuration:
@@ -300,7 +300,7 @@ plank:
         mediaTypes:
           log: text/plain
       gcs_credentials_secret: gce-sa-credentials-gcs-qe-private-deck
-      timeout: 22h0m0s
+      timeout: 23h0m0s
     repo: openshift/verification-tests
   - config:
       timeout: 6h0m0s
@@ -372,9 +372,7 @@ prowjob_namespace: ci
 push_gateway:
   interval: 1m0s
   serve_metrics: false
-scheduler:
-  enabled: true
-  failover: {}
+scheduler: {}
 sinker:
   max_pod_age: 6h0m0s
   max_prowjob_age: 24h0m0s
@@ -400,16 +398,12 @@ tide:
       containers:
         repos:
           aardvark-dns:
-            required-contexts:
-            - Total Success
             skip-unknown-contexts: true
           buildah:
             required-contexts:
             - Total Success
             skip-unknown-contexts: true
           common:
-            required-contexts:
-            - Total Success
             skip-unknown-contexts: true
           dnsname:
             skip-unknown-contexts: true
@@ -420,8 +414,6 @@ tide:
           luksy:
             skip-unknown-contexts: true
           netavark:
-            required-contexts:
-            - Total Success
             skip-unknown-contexts: true
           podman:
             required-contexts:
@@ -430,8 +422,6 @@ tide:
           podman-py:
             skip-unknown-contexts: true
           storage:
-            required-contexts:
-            - Total Success
             skip-unknown-contexts: true
       cri-o:
         repos: