diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 540da14402192..6a39b58b0957e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -65,6 +65,30 @@ server/src/main/java/org/elasticsearch/bootstrap @elastic/es-core-infra
 server/src/main/java/org/elasticsearch/node @elastic/es-core-infra
 server/src/main/java/org/elasticsearch/plugins @elastic/es-core-infra
 server/src/main/java/org/elasticsearch/threadpool @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/breaker @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/bytes @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/cli @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/collect @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/component @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/compress @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/document @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/file @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/hash @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/io @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/logging @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/metrics @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/network @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/path @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/recycler @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/regex @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/scheduler @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/settings @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/text @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/time @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/transport @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/unit @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/util @elastic/es-core-infra
+server/src/main/java/org/elasticsearch/common/xcontent @elastic/es-core-infra
 
 # Security
 x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege @elastic/es-security