diff --git a/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__416.yaml b/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__416.yaml
index 93a50532c37f..172a6ef5b960 100755
--- a/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__416.yaml
+++ b/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__416.yaml
@@ -73,13 +73,12 @@ promotion:
   to:
   - additional_images:
       client-src: src
+    name: knative-v1.15
     namespace: openshift
-    tag: knative-v1.15
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: fast
       version: "4.16"
 resources:
   '*':
@@ -88,14 +87,16 @@ resources:
       memory: 1Gi
 tests:
 - as: test-e2e-aws-416
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: serverless-ci
+    product: ocp
+    timeout: 2h0m0s
+    version: "4.16"
   steps:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
-    cluster_profile: aws-serverless
-    env:
-      BASE_DOMAIN: serverless.devcluster.openshift.com
-      SPOT_INSTANCES: "true"
-      ZONES_COUNT: "1"
     post:
     - as: knative-must-gather
       best_effort: true
@@ -131,7 +132,6 @@ tests:
           cpu: 300m
           memory: 300Mi
       timeout: 20m0s
-    - ref: ipi-deprovision-deprovision
     test:
     - as: test
       cli: latest
@@ -153,7 +153,7 @@ tests:
         requests:
           cpu: 100m
       timeout: 4h0m0s
-    workflow: ipi-aws
+    workflow: generic-claim
 zz_generated_metadata:
   branch: release-v1.15
   org: openshift-knative
diff --git a/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__415.yaml b/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__417.yaml
similarity index 97%
rename from ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__415.yaml
rename to ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__417.yaml
index 2106eaa836b9..34dc6712c2c1 100755
--- a/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__415.yaml
+++ b/ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.15__417.yaml
@@ -73,20 +73,21 @@ promotion:
   to:
   - additional_images:
       client-src: src
-    name: knative-v1.15
     namespace: openshift
+    tag: knative-v1.15
 releases:
   latest:
-    release:
-      channel: fast
-      version: "4.15"
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.17"
 resources:
   '*':
     requests:
       cpu: 500m
       memory: 1Gi
 tests:
-- as: test-e2e-aws-415
+- as: test-e2e-aws-417
   steps:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
@@ -157,4 +158,4 @@ zz_generated_metadata:
   branch: release-v1.15
   org: openshift-knative
   repo: client
-  variant: "415"
+  variant: "417"
diff --git a/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-postsubmits.yaml b/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-postsubmits.yaml
index 1eaec4ccdd14..8a9fd922491c 100644
--- a/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-postsubmits.yaml
@@ -10,10 +10,10 @@ postsubmits:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
-      ci-operator.openshift.io/variant: "415"
+      ci-operator.openshift.io/variant: "416"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-knative-client-release-v1.15-415-images
+    name: branch-ci-openshift-knative-client-release-v1.15-416-images
     path_alias: github.com/knative/client
     spec:
       containers:
@@ -25,7 +25,7 @@ postsubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=src
-        - --variant=415
+        - --variant=416
         command:
         - ci-operator
         image: ci-operator:latest
@@ -74,11 +74,11 @@ postsubmits:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
-      ci-operator.openshift.io/variant: "416"
+      ci-operator.openshift.io/variant: "417"
       ci.openshift.io/generator: prowgen
-      job-release: "4.16"
+      job-release: "4.17"
     max_concurrency: 1
-    name: branch-ci-openshift-knative-client-release-v1.15-416-images
+    name: branch-ci-openshift-knative-client-release-v1.15-417-images
     path_alias: github.com/knative/client
     spec:
       containers:
@@ -90,7 +90,7 @@ postsubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=src
-        - --variant=416
+        - --variant=417
         command:
         - ci-operator
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-presubmits.yaml b/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-presubmits.yaml
index bedf38f3acfa..537dc49a43de 100644
--- a/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-presubmits.yaml
+++ b/ci-operator/jobs/openshift-knative/client/openshift-knative-client-release-v1.15-presubmits.yaml
@@ -6,17 +6,17 @@ presubmits:
     - ^release-v1\.15$
     - ^release-v1\.15-
     cluster: build10
-    context: ci/prow/415-images
+    context: ci/prow/416-images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/variant: "415"
+      ci-operator.openshift.io/variant: "416"
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-client-release-v1.15-415-images
+    name: pull-ci-openshift-knative-client-release-v1.15-416-images
     path_alias: github.com/knative/client
-    rerun_command: /test 415-images
+    rerun_command: /test 416-images
     spec:
       containers:
       - args:
@@ -25,7 +25,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=src
-        - --variant=415
+        - --variant=416
         command:
         - ci-operator
         image: ci-operator:latest
@@ -58,37 +58,34 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )415-images,?($|\s.*)
+    trigger: (?m)^/test( | .* )416-images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-v1\.15$
     - ^release-v1\.15-
     cluster: build10
-    context: ci/prow/415-test-e2e-aws-415
+    context: ci/prow/416-test-e2e-aws-416
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-serverless
-      ci-operator.openshift.io/variant: "415"
+      ci-operator.openshift.io/variant: "416"
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-client-release-v1.15-415-test-e2e-aws-415
+    name: pull-ci-openshift-knative-client-release-v1.15-416-test-e2e-aws-416
     path_alias: github.com/knative/client
-    rerun_command: /test 415-test-e2e-aws-415
+    rerun_command: /test 416-test-e2e-aws-416
     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
-        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/test-e2e-aws-415-cluster-profile
-        - --target=test-e2e-aws-415
-        - --variant=415
+        - --target=test-e2e-aws-416
+        - --variant=416
         command:
         - ci-operator
         image: ci-operator:latest
@@ -98,17 +95,15 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/test-e2e-aws-415-cluster-profile
-          name: cluster-profile
         - 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
@@ -120,18 +115,12 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: cluster-profile
+      - name: hive-hive-credentials
         secret:
-          secretName: cluster-secrets-aws-serverless
+          secretName: hive-hive-credentials
       - name: manifest-tool-local-pusher
         secret:
           secretName: manifest-tool-local-pusher
@@ -141,25 +130,25 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )415-test-e2e-aws-415,?($|\s.*)
+    trigger: (?m)^/test( | .* )416-test-e2e-aws-416,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-v1\.15$
     - ^release-v1\.15-
     cluster: build10
-    context: ci/prow/416-images
+    context: ci/prow/417-images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/variant: "416"
+      ci-operator.openshift.io/variant: "417"
       ci.openshift.io/generator: prowgen
-      job-release: "4.16"
+      job-release: "4.17"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-client-release-v1.15-416-images
+    name: pull-ci-openshift-knative-client-release-v1.15-417-images
     path_alias: github.com/knative/client
-    rerun_command: /test 416-images
+    rerun_command: /test 417-images
     spec:
       containers:
       - args:
@@ -168,7 +157,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=src
-        - --variant=416
+        - --variant=417
         command:
         - ci-operator
         image: ci-operator:latest
@@ -201,27 +190,27 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )416-images,?($|\s.*)
+    trigger: (?m)^/test( | .* )417-images,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-v1\.15$
     - ^release-v1\.15-
     cluster: build10
-    context: ci/prow/416-test-e2e-aws-416
+    context: ci/prow/417-test-e2e-aws-417
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-serverless
-      ci-operator.openshift.io/variant: "416"
+      ci-operator.openshift.io/variant: "417"
       ci.openshift.io/generator: prowgen
-      job-release: "4.16"
+      job-release: "4.17"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-knative-client-release-v1.15-416-test-e2e-aws-416
+    name: pull-ci-openshift-knative-client-release-v1.15-417-test-e2e-aws-417
     path_alias: github.com/knative/client
-    rerun_command: /test 416-test-e2e-aws-416
+    rerun_command: /test 417-test-e2e-aws-417
     spec:
       containers:
       - args:
@@ -230,9 +219,9 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/test-e2e-aws-416-cluster-profile
-        - --target=test-e2e-aws-416
-        - --variant=416
+        - --secret-dir=/usr/local/test-e2e-aws-417-cluster-profile
+        - --target=test-e2e-aws-417
+        - --variant=417
         command:
         - ci-operator
         image: ci-operator:latest
@@ -248,7 +237,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/test-e2e-aws-416-cluster-profile
+        - mountPath: /usr/local/test-e2e-aws-417-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -285,4 +274,4 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )416-test-e2e-aws-416,?($|\s.*)
+    trigger: (?m)^/test( | .* )417-test-e2e-aws-417,?($|\s.*)