diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml
index dc66b126516df..e838eb8be197b 100644
--- a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml
@@ -33,7 +33,7 @@ images:
     coreos_coreos-assembler_4.11:
       as:
       - registry.svc.ci.openshift.org/coreos/coreos-assembler:4.11
-  to: build-test-qemu-img
+  to: build-image
 promotion:
   disabled: true
   excluded_images:
@@ -53,26 +53,42 @@ releases:
 resources:
   '*':
     requests:
-      cpu: 1000m
-      memory: 1Gi
-  build-test-qemu:
+      cpu: 100m
+      memory: 200Mi
+  rhcos-86-build-test-metal:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
-      cpu: 1000m
+      cpu: 2000m
+      devices.kubevirt.io/kvm: "1"
+      memory: 3Gi
+  rhcos-86-build-test-qemu:
+    limits:
+      devices.kubevirt.io/kvm: "1"
+    requests:
+      cpu: 2000m
       devices.kubevirt.io/kvm: "1"
       memory: 3Gi
 tests:
 - as: validate
-  commands: ./ci/validate.sh
+  commands: ci/prow-entrypoint.sh validate
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: build-test-qemu
-  commands: /src/ci/build-test-qemu.sh
+- as: rhcos-86-build-test-qemu
+  cluster: build02
+  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-qemu
+  container:
+    from: build-image
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  timeout: 3h0m0s
+- as: rhcos-86-build-test-metal
+  cluster: build02
+  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-metal
   container:
-    from: build-test-qemu-img
+    from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  timeout: 3h0m0s
 zz_generated_metadata:
   branch: release-4.11
   org: openshift
diff --git a/ci-operator/jobs/openshift/os/openshift-os-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-release-4.11-presubmits.yaml
index 8a1b5af092f9d..227949dad02f0 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-release-4.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-release-4.11-presubmits.yaml
@@ -1,21 +1,73 @@
 presubmits:
   openshift/os:
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.11$
+    - ^release-4\.11-
+    cluster: build03
+    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-os-release-4.11-images
+    rerun_command: /test images
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
     cluster: build02
-    context: ci/prow/build-test-qemu
+    context: ci/prow/rhcos-86-build-test-metal
     decorate: true
     decoration_config:
       skip_cloning: true
+      timeout: 3h0m0s
     labels:
+      ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
       devices.kubevirt.io/kvm: "1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-release-4.11-build-test-qemu
-    rerun_command: /test build-test-qemu
+    name: pull-ci-openshift-os-release-4.11-rhcos-86-build-test-metal
+    rerun_command: /test rhcos-86-build-test-metal
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -23,7 +75,7 @@ presubmits:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=build-test-qemu
+        - --target=rhcos-86-build-test-metal
         command:
         - ci-operator
         image: ci-operator:latest
@@ -50,22 +102,25 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )build-test-qemu,?($|\s.*)
+    trigger: (?m)^/test( | .* )rhcos-86-build-test-metal,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
-    cluster: build03
-    context: ci/prow/images
+    cluster: build02
+    context: ci/prow/rhcos-86-build-test-qemu
     decorate: true
     decoration_config:
       skip_cloning: true
+      timeout: 3h0m0s
     labels:
+      ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      devices.kubevirt.io/kvm: "1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-release-4.11-images
-    rerun_command: /test images
+    name: pull-ci-openshift-os-release-4.11-rhcos-86-build-test-qemu
+    rerun_command: /test rhcos-86-build-test-qemu
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -73,7 +128,7 @@ presubmits:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --target=rhcos-86-build-test-qemu
         command:
         - ci-operator
         image: ci-operator:latest
@@ -100,7 +155,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )rhcos-86-build-test-qemu,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: