diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..5ba83cd5
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# Specify default code owners for all files with a wildcard:
+* @livekit/robotics-devs @xianshijing-lk
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index 946b700b..00000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify a default Code Owner for all files with a wildcard:
-* @alan-george-lk @stephen-derosa @xianshijing-lk