diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
index e8704b6ca1461..e5409f80803cd 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
@@ -85,7 +85,7 @@ tests:
     make verify
   container:
     from: src
-- as: bootstrap-e2e
+- as: bootstrap-unit
   commands: make bootstrap-e2e
   container:
     from: src
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml
index 3ce84c4cb4cca..2893ac1daa741 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml
@@ -86,7 +86,7 @@ tests:
     make verify
   container:
     from: src
-- as: bootstrap-e2e
+- as: bootstrap-unit
   commands: make bootstrap-e2e
   container:
     from: src
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
index f924ac8a2c279..fa4b49513a768 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
@@ -1,26 +1,26 @@
 presubmits:
   openshift/machine-config-operator:
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/bootstrap-e2e
+    context: ci/prow/bootstrap-unit
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-master-bootstrap-e2e
+    name: pull-ci-openshift-machine-config-operator-master-bootstrap-unit
     optional: true
-    rerun_command: /test bootstrap-e2e
+    rerun_command: /test bootstrap-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=bootstrap-e2e
+        - --target=bootstrap-unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )bootstrap-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )bootstrap-unit,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml
index f0cd662b44058..642ff0bf25dfe 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml
@@ -1,26 +1,26 @@
 presubmits:
   openshift/machine-config-operator:
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
     cluster: build02
-    context: ci/prow/bootstrap-e2e
+    context: ci/prow/bootstrap-unit
     decorate: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.10-bootstrap-e2e
+    name: pull-ci-openshift-machine-config-operator-release-4.10-bootstrap-unit
     optional: true
-    rerun_command: /test bootstrap-e2e
+    rerun_command: /test bootstrap-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=bootstrap-e2e
+        - --target=bootstrap-unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )bootstrap-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )bootstrap-unit,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: