diff --git a/config/v1/0000_10_config-operator_01_build.crd.yaml b/config/v1/0000_10_openshift-controller-manager-operator_01_build.crd.yaml
similarity index 99%
rename from config/v1/0000_10_config-operator_01_build.crd.yaml
rename to config/v1/0000_10_openshift-controller-manager-operator_01_build.crd.yaml
index 75166deb7c1..9e80775ffef 100644
--- a/config/v1/0000_10_config-operator_01_build.crd.yaml
+++ b/config/v1/0000_10_openshift-controller-manager-operator_01_build.crd.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/470
+    capability.openshift.io/name: Build
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
diff --git a/config/v1/stable.build.testsuite.yaml b/config/v1/stable.build.testsuite.yaml
index cdd8a9b7011..b422ebd2065 100644
--- a/config/v1/stable.build.testsuite.yaml
+++ b/config/v1/stable.build.testsuite.yaml
@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[Stable] Build"
-crd: 0000_10_config-operator_01_build.crd.yaml
+crd: 0000_10_openshift-controller-manager-operator_01_build.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal Build
diff --git a/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml b/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml
deleted file mode 100644
index a6dab5dc1f4..00000000000
--- a/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: config.openshift.io/v1
-kind: Build
-metadata:
-  name: cluster
-  annotations:
-    include.release.openshift.io/ibm-cloud-managed: "true"
-    include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
-    release.openshift.io/create-only: "true"
-spec: {}