diff --git a/roles/openshift-apps/asknot/templates/buildconfig.yml b/roles/openshift-apps/asknot/templates/buildconfig.yml
index 62e881a2e2..644e42277c 100644
--- a/roles/openshift-apps/asknot/templates/buildconfig.yml
+++ b/roles/openshift-apps/asknot/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: asknot-build
diff --git a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml
index eb7a794806..837825f3f6 100644
--- a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml
+++ b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: blockerbugs-build
@@ -29,7 +29,7 @@ spec:
   - type: ConfigChange
   - type: ImageChange
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: qa-landing-page-build
@@ -60,4 +60,4 @@ spec:
         value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/"
   triggers:
   - type: ConfigChange
-  - type: ImageChange
\ No newline at end of file
+  - type: ImageChange
diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml
index 61c2f0a6d0..2bb0f66498 100644
--- a/roles/openshift-apps/bodhi/templates/buildconfig.yml
+++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml
@@ -1,7 +1,7 @@
 {% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 items:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -25,7 +25,7 @@ items:
       to:
         kind: ImageStreamTag
         name: bodhi-base:latest
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
diff --git a/roles/openshift-apps/bugzilla2fedmsg/templates/buildconfig.yml b/roles/openshift-apps/bugzilla2fedmsg/templates/buildconfig.yml
index 88f240327a..e930b92adf 100644
--- a/roles/openshift-apps/bugzilla2fedmsg/templates/buildconfig.yml
+++ b/roles/openshift-apps/bugzilla2fedmsg/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: bugzilla2fedmsg-build
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml b/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml
index 468dac2785..3908beb283 100644
--- a/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml
+++ b/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: discourse2fedmsg
diff --git a/roles/openshift-apps/elections/templates/buildconfig.yml b/roles/openshift-apps/elections/templates/buildconfig.yml
index 5c4b28bd1f..6a04a882ef 100644
--- a/roles/openshift-apps/elections/templates/buildconfig.yml
+++ b/roles/openshift-apps/elections/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: elections-build
diff --git a/roles/openshift-apps/fedocal/templates/buildconfig.yml b/roles/openshift-apps/fedocal/templates/buildconfig.yml
index 19f8e9e614..dc5335fa87 100644
--- a/roles/openshift-apps/fedocal/templates/buildconfig.yml
+++ b/roles/openshift-apps/fedocal/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: fedocal-build
diff --git a/roles/openshift-apps/fedora-packages-static/templates/buildconfig.yml b/roles/openshift-apps/fedora-packages-static/templates/buildconfig.yml
index d02f05f1f0..1c9c7c1ea6 100644
--- a/roles/openshift-apps/fedora-packages-static/templates/buildconfig.yml
+++ b/roles/openshift-apps/fedora-packages-static/templates/buildconfig.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: fedora-packages-static-build
diff --git a/roles/openshift-apps/kerneltest/templates/buildconfig.yml b/roles/openshift-apps/kerneltest/templates/buildconfig.yml
index 6f288ab807..162307aa1c 100644
--- a/roles/openshift-apps/kerneltest/templates/buildconfig.yml
+++ b/roles/openshift-apps/kerneltest/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: kerneltest-build
diff --git a/roles/openshift-apps/mdapi/templates/buildconfig.yml b/roles/openshift-apps/mdapi/templates/buildconfig.yml
index d6526a59be..2fa320e0b1 100644
--- a/roles/openshift-apps/mdapi/templates/buildconfig.yml
+++ b/roles/openshift-apps/mdapi/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: mdapi-build
diff --git a/roles/openshift-apps/messaging-bridges/templates/buildconfig.yml b/roles/openshift-apps/messaging-bridges/templates/buildconfig.yml
index e3c2c9ff33..e26fd58b2a 100644
--- a/roles/openshift-apps/messaging-bridges/templates/buildconfig.yml
+++ b/roles/openshift-apps/messaging-bridges/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: messaging-bridges-build
diff --git a/roles/openshift-apps/monitor-dashboard/templates/buildconfig.yml b/roles/openshift-apps/monitor-dashboard/templates/buildconfig.yml
index 352ac2db0e..0b8cfbe673 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/buildconfig.yml
+++ b/roles/openshift-apps/monitor-dashboard/templates/buildconfig.yml
@@ -1,7 +1,7 @@
 {% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 items:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
diff --git a/roles/openshift-apps/monitor-gating/templates/buildconfig.yml b/roles/openshift-apps/monitor-gating/templates/buildconfig.yml
index 45c3a03140..136c823f59 100644
--- a/roles/openshift-apps/monitor-gating/templates/buildconfig.yml
+++ b/roles/openshift-apps/monitor-gating/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: monitor-gating-build
diff --git a/roles/openshift-apps/nuancier/templates/buildconfig.yml b/roles/openshift-apps/nuancier/templates/buildconfig.yml
index 8793e7dde1..751a3a54d1 100644
--- a/roles/openshift-apps/nuancier/templates/buildconfig.yml
+++ b/roles/openshift-apps/nuancier/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: nuancier-build
diff --git a/roles/openshift-apps/oraculum/templates/buildconfig.yml b/roles/openshift-apps/oraculum/templates/buildconfig.yml
index 45674da970..3f5db192ab 100644
--- a/roles/openshift-apps/oraculum/templates/buildconfig.yml
+++ b/roles/openshift-apps/oraculum/templates/buildconfig.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: packager-dashboard-build
@@ -25,7 +25,7 @@ spec:
   - type: ConfigChange
   - type: ImageChange
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: packager-dashboard-frontend-build
diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
index 2ece95a5cc..1b597761ea 100644
--- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
+++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
@@ -1,7 +1,7 @@
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 items:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
diff --git a/roles/openshift-apps/review-stats/templates/buildconfig.yml b/roles/openshift-apps/review-stats/templates/buildconfig.yml
index 3594ae8941..56aa629d49 100644
--- a/roles/openshift-apps/review-stats/templates/buildconfig.yml
+++ b/roles/openshift-apps/review-stats/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   labels:
diff --git a/roles/openshift-apps/silverblue/templates/buildconfig.yml b/roles/openshift-apps/silverblue/templates/buildconfig.yml
index 485ba44ea2..eeb2b33dfc 100644
--- a/roles/openshift-apps/silverblue/templates/buildconfig.yml
+++ b/roles/openshift-apps/silverblue/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: silverblue-build
diff --git a/roles/openshift-apps/testdays/templates/buildconfig.yml b/roles/openshift-apps/testdays/templates/buildconfig.yml
index a0a6b15c91..9cca925d0e 100644
--- a/roles/openshift-apps/testdays/templates/buildconfig.yml
+++ b/roles/openshift-apps/testdays/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: testdays-build
@@ -29,7 +29,7 @@ spec:
   - type: ConfigChange
   - type: ImageChange
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: resultsdb-build
diff --git a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml
index 2866716cca..6f54967e2e 100644
--- a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml
+++ b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml
@@ -1,6 +1,6 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 items:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
diff --git a/roles/openshift-apps/toddlers/templates/buildconfig.yml b/roles/openshift-apps/toddlers/templates/buildconfig.yml
index b0d9b2fc8d..a05daa465d 100644
--- a/roles/openshift-apps/toddlers/templates/buildconfig.yml
+++ b/roles/openshift-apps/toddlers/templates/buildconfig.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: toddlers-build
diff --git a/roles/openshift-apps/waiverdb/templates/buildconfig.yml b/roles/openshift-apps/waiverdb/templates/buildconfig.yml
index a1318154d0..0c3777a373 100644
--- a/roles/openshift-apps/waiverdb/templates/buildconfig.yml
+++ b/roles/openshift-apps/waiverdb/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: "waiverdb-docker-build"