diff --git a/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml b/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml
index 03c6afddb3ce..e07e04ac016a 100644
--- a/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml
+++ b/ci-operator/config/coreos/rpm-ostree/coreos-rpm-ostree-master.yaml
@@ -1,4 +1,4 @@
-binary_build_commands: env SKIP_INSTALLDEPS=1 ./ci/build-check.sh
+binary_build_commands: ./ci/build.sh && make install
 build_root:
   image_stream_tag:
     name: cosa-buildroot
@@ -8,13 +8,23 @@ resources:
   '*':
     requests:
       cpu: 1000m
-      memory: 3Gi
+      memory: 1Gi
 tests:
 - artifact_dir: /tmp/artifacts
-  as: sanity
+  as: build
   commands: rpm-ostree --version
   container:
     from: bin
+- artifact_dir: /tmp/artifacts
+  as: unit
+  commands: ./ci/unit.sh
+  container:
+    from: src
+- artifact_dir: /tmp/artifacts
+  as: build-clang
+  commands: ./ci/clang-build-check.sh
+  container:
+    from: src
 zz_generated_metadata:
   branch: master
   org: coreos
diff --git a/ci-operator/jobs/coreos/rpm-ostree/coreos-rpm-ostree-master-presubmits.yaml b/ci-operator/jobs/coreos/rpm-ostree/coreos-rpm-ostree-master-presubmits.yaml
index b1e181d72981..f3d642248e94 100644
--- a/ci-operator/jobs/coreos/rpm-ostree/coreos-rpm-ostree-master-presubmits.yaml
+++ b/ci-operator/jobs/coreos/rpm-ostree/coreos-rpm-ostree-master-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - master
     cluster: build02
-    context: ci/prow/sanity
+    context: ci/prow/build
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-coreos-rpm-ostree-master-sanity
-    rerun_command: /test sanity
+    name: pull-ci-coreos-rpm-ostree-master-build
+    rerun_command: /test build
     spec:
       containers:
       - args:
@@ -21,7 +21,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --target=sanity
+        - --target=build
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,4 +48,102 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )sanity,?($|\s.*)
+    trigger: (?m)^/test( | .* )build,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build02
+    context: ci/prow/build-clang
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-coreos-rpm-ostree-master-build-clang
+    rerun_command: /test build-clang
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --target=build-clang
+        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( | .* )build-clang,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build02
+    context: ci/prow/unit
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-coreos-rpm-ostree-master-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-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --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: /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( | .* )unit,?($|\s.*)