diff --git a/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml b/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml
index 9157ad0049..e01f06bb64 100644
--- a/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml
+++ b/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml
@@ -38,16 +38,16 @@ contents:
     runtime_root = "/run/runc"
     allowed_annotations = [
         "io.containers.trace-syscall",
-        "io.kubernetes.cri-o.Devices",
-        "io.kubernetes.cri-o.LinkLogs",
+        "devices.crio.io",
+        "link-logs.crio.io",
     ]
 
     [crio.runtime.runtimes.crun]
     runtime_root = "/run/crun"
     allowed_annotations = [
         "io.containers.trace-syscall",
-        "io.kubernetes.cri-o.Devices",
-        "io.kubernetes.cri-o.LinkLogs",
+        "devices.crio.io",
+        "link-logs.crio.io",
     ]
     # Based on https://github.com/containers/crun/blob/27d7dd3a0/README.md?plain=1#L48
     container_min_memory = "512KiB"
@@ -55,8 +55,8 @@ contents:
     [crio.runtime.workloads.openshift-builder]
     activation_annotation = "io.openshift.builder"
     allowed_annotations = [
-      "io.kubernetes.cri-o.userns-mode",
-      "io.kubernetes.cri-o.Devices"
+      "userns-mode.crio.io",
+      "devices.crio.io"
     ]
     [crio.runtime.workloads.openshift-builder.resources]
 
diff --git a/templates/master/01-master-container-runtime/_base/files/crio.yaml b/templates/master/01-master-container-runtime/_base/files/crio.yaml
index 914489da78..3983fd4193 100644
--- a/templates/master/01-master-container-runtime/_base/files/crio.yaml
+++ b/templates/master/01-master-container-runtime/_base/files/crio.yaml
@@ -38,16 +38,16 @@ contents:
     runtime_root = "/run/runc"
     allowed_annotations = [
         "io.containers.trace-syscall",
-        "io.kubernetes.cri-o.Devices",
-        "io.kubernetes.cri-o.LinkLogs",
+        "devices.crio.io",
+        "link-logs.crio.io",
     ]
 
     [crio.runtime.runtimes.crun]
     runtime_root = "/run/crun"
     allowed_annotations = [
         "io.containers.trace-syscall",
-        "io.kubernetes.cri-o.Devices",
-        "io.kubernetes.cri-o.LinkLogs",
+        "devices.crio.io",
+        "link-logs.crio.io",
     ]
     # Based on https://github.com/containers/crun/blob/27d7dd3a0/README.md?plain=1#L48
     container_min_memory = "512KiB"
@@ -56,8 +56,8 @@ contents:
     [crio.runtime.workloads.openshift-builder]
     activation_annotation = "io.openshift.builder"
     allowed_annotations = [
-      "io.kubernetes.cri-o.userns-mode",
-      "io.kubernetes.cri-o.Devices"
+      "userns-mode.crio.io",
+      "devices.crio.io"
     ]
     [crio.runtime.workloads.openshift-builder.resources]
 
diff --git a/templates/worker/01-worker-container-runtime/_base/files/crio.yaml b/templates/worker/01-worker-container-runtime/_base/files/crio.yaml
index e8cb1f9222..a9ef69d3e5 100644
--- a/templates/worker/01-worker-container-runtime/_base/files/crio.yaml
+++ b/templates/worker/01-worker-container-runtime/_base/files/crio.yaml
@@ -38,16 +38,16 @@ contents:
     runtime_root = "/run/runc"
     allowed_annotations = [
         "io.containers.trace-syscall",
-        "io.kubernetes.cri-o.Devices",
-        "io.kubernetes.cri-o.LinkLogs",
+        "devices.crio.io",
+        "link-logs.crio.io",
     ]
 
     [crio.runtime.runtimes.crun]
     runtime_root = "/run/crun"
     allowed_annotations = [
         "io.containers.trace-syscall",
-        "io.kubernetes.cri-o.Devices",
-        "io.kubernetes.cri-o.LinkLogs",
+        "devices.crio.io",
+        "link-logs.crio.io",
     ]
     # Based on https://github.com/containers/crun/blob/27d7dd3a0/README.md?plain=1#L48
     container_min_memory = "512KiB"
@@ -56,8 +56,8 @@ contents:
     [crio.runtime.workloads.openshift-builder]
     activation_annotation = "io.openshift.builder"
     allowed_annotations = [
-      "io.kubernetes.cri-o.userns-mode",
-      "io.kubernetes.cri-o.Devices"
+      "userns-mode.crio.io",
+      "devices.crio.io"
     ]
     [crio.runtime.workloads.openshift-builder.resources]