diff --git a/pkg/build/controller/strategy/util.go b/pkg/build/controller/strategy/util.go
index 379632bec..5651963d1 100644
--- a/pkg/build/controller/strategy/util.go
+++ b/pkg/build/controller/strategy/util.go
@@ -601,14 +601,14 @@ func builderMinSecurityContext() *corev1.SecurityContext {
 // Reference: https://github.com/openshift/machine-config-operator/pull/2805
 func setupBuilderDeviceFUSE(pod *corev1.Pod) {
 	metav1.SetMetaDataAnnotation(&pod.ObjectMeta, "io.openshift.builder", "")
-	metav1.SetMetaDataAnnotation(&pod.ObjectMeta, "io.kubernetes.cri-o.Devices", "/dev/fuse:rwm")
+	metav1.SetMetaDataAnnotation(&pod.ObjectMeta, "devices.crio.io", "/dev/fuse:rwm")
 }
 
 // Request that the builder be run in a user namespace, mapped from host ID
 // ranges chosen by the node.
 func setupBuilderAutonsUser(build *buildv1.Build, vars []corev1.EnvVar, pod *corev1.Pod) {
 	metav1.SetMetaDataAnnotation(&pod.ObjectMeta, "io.openshift.builder", "")
-	metav1.SetMetaDataAnnotation(&pod.ObjectMeta, "io.kubernetes.cri-o.userns-mode", "auto:size=65536")
+	metav1.SetMetaDataAnnotation(&pod.ObjectMeta, "userns-mode.crio.io", "auto:size=65536")
 }
 
 // setupBuildCAs mounts certificate authorities for the build from a predetermined ConfigMap.
diff --git a/pkg/build/controller/strategy/util_test.go b/pkg/build/controller/strategy/util_test.go
index 06e02f640..fa03a9fc2 100644
--- a/pkg/build/controller/strategy/util_test.go
+++ b/pkg/build/controller/strategy/util_test.go
@@ -811,17 +811,17 @@ func testCreateBuildPodAutonsUser(t *testing.T, build *buildv1.Build, strategy b
 			privileged: true,
 			noAnnotations: []string{
 				"io.openshift.builder",
-				"io.kubernetes.cri-o.Devices",
-				"io.kubernetes.cri-o.userns-mode",
+				"devices.crio.io",
+				"userns-mode.crio.io",
 			},
 		},
 		{
 			env:        "BUILD_PRIVILEGED=0",
 			privileged: false,
 			annotations: map[string]string{
-				"io.openshift.builder":            "",
-				"io.kubernetes.cri-o.Devices":     "/dev/fuse:rwm",
-				"io.kubernetes.cri-o.userns-mode": "auto:size=65536",
+				"io.openshift.builder": "",
+				"devices.crio.io":      "/dev/fuse:rwm",
+				"userns-mode.crio.io":  "auto:size=65536",
 			},
 		},
 		{
@@ -829,17 +829,17 @@ func testCreateBuildPodAutonsUser(t *testing.T, build *buildv1.Build, strategy b
 			privileged: true,
 			noAnnotations: []string{
 				"io.openshift.builder",
-				"io.kubernetes.cri-o.Devices",
-				"io.kubernetes.cri-o.userns-mode",
+				"devices.crio.io",
+				"userns-mode.crio.io",
 			},
 		},
 		{
 			env:        "BUILD_PRIVILEGED=false",
 			privileged: false,
 			annotations: map[string]string{
-				"io.openshift.builder":            "",
-				"io.kubernetes.cri-o.Devices":     "/dev/fuse:rwm",
-				"io.kubernetes.cri-o.userns-mode": "auto:size=65536",
+				"io.openshift.builder": "",
+				"devices.crio.io":      "/dev/fuse:rwm",
+				"userns-mode.crio.io":  "auto:size=65536",
 			},
 		},
 		{
@@ -847,8 +847,8 @@ func testCreateBuildPodAutonsUser(t *testing.T, build *buildv1.Build, strategy b
 			privileged: true,
 			noAnnotations: []string{
 				"io.openshift.builder",
-				"io.kubernetes.cri-o.Devices",
-				"io.kubernetes.cri-o.userns-mode",
+				"devices.crio.io",
+				"userns-mode.crio.io",
 			},
 		},
 	} {