diff --git a/chromeos/third_party/DIR_METADATA b/chromeos/third_party/DIR_METADATA
new file mode 100644
index 0000000000000..d08126acf8184
--- /dev/null
+++ b/chromeos/third_party/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+  component: "UI>Shell"
+}
diff --git a/chromeos/third_party/OWNERS b/chromeos/third_party/OWNERS
index 036a36bd6e6f4..e69de29bb2d1d 100644
--- a/chromeos/third_party/OWNERS
+++ b/chromeos/third_party/OWNERS
@@ -1 +0,0 @@
-# COMPONENT: UI>Shell
diff --git a/chromeos/timezone/DIR_METADATA b/chromeos/timezone/DIR_METADATA
new file mode 100644
index 0000000000000..2aaf8e2eed434
--- /dev/null
+++ b/chromeos/timezone/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+  component: "Internals>Core"
+}
diff --git a/chromeos/timezone/OWNERS b/chromeos/timezone/OWNERS
index 0b6f1c2c5e7b3..6faee649978f4 100644
--- a/chromeos/timezone/OWNERS
+++ b/chromeos/timezone/OWNERS
@@ -1,2 +1 @@
-alemate@chromium.org
-# COMPONENT: Internals>Core
+alemate@chromium.org
\ No newline at end of file
diff --git a/chromeos/tools/DIR_METADATA b/chromeos/tools/DIR_METADATA
new file mode 100644
index 0000000000000..d08126acf8184
--- /dev/null
+++ b/chromeos/tools/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+  component: "UI>Shell"
+}
diff --git a/chromeos/tools/OWNERS b/chromeos/tools/OWNERS
index 036a36bd6e6f4..e69de29bb2d1d 100644
--- a/chromeos/tools/OWNERS
+++ b/chromeos/tools/OWNERS
@@ -1 +0,0 @@
-# COMPONENT: UI>Shell
diff --git a/chromeos/tools/onc_validator/DIR_METADATA b/chromeos/tools/onc_validator/DIR_METADATA
new file mode 100644
index 0000000000000..3ecb4771a1281
--- /dev/null
+++ b/chromeos/tools/onc_validator/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+  component: "Enterprise"
+}
diff --git a/chromeos/tools/onc_validator/OWNERS b/chromeos/tools/onc_validator/OWNERS
index 311683616728e..607dc3e2a478e 100644
--- a/chromeos/tools/onc_validator/OWNERS
+++ b/chromeos/tools/onc_validator/OWNERS
@@ -1,4 +1,2 @@
 stevenjb@chromium.org
 emaxx@chromium.org
-
-# COMPONENT: Enterprise
diff --git a/chromeos/tpm/DIR_METADATA b/chromeos/tpm/DIR_METADATA
new file mode 100644
index 0000000000000..d08126acf8184
--- /dev/null
+++ b/chromeos/tpm/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+  component: "UI>Shell"
+}
diff --git a/chromeos/tpm/OWNERS b/chromeos/tpm/OWNERS
index 036a36bd6e6f4..e69de29bb2d1d 100644
--- a/chromeos/tpm/OWNERS
+++ b/chromeos/tpm/OWNERS
@@ -1 +0,0 @@
-# COMPONENT: UI>Shell