diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3439d93351..0efd392e05 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,3 +9,8 @@ source/adapters/hip             @oneapi-src/unified-runtime-hip-write
 
 # OpenCL adapter
 source/adapters/opencl          @oneapi-src/unified-runtime-opencl-write
+
+# Command-buffer experimental feature
+source/adapters/**/command_buffer.*  @oneapi-src/unified-runtime-command-buffer-write
+scripts/core/EXP-COMMAND-BUFFER.rst  @oneapi-src/unified-runtime-command-buffer-write
+scripts/core/exp-command-buffer.yml  @oneapi-src/unified-runtime-command-buffer-write