diff --git a/.github/component_owners.yml b/.github/component_owners.yml
index edfac9761f..7ac25df414 100644
--- a/.github/component_owners.yml
+++ b/.github/component_owners.yml
@@ -1,49 +1,16 @@
 components:
 
-  docs/instrumentation:
-    - nemoshlag
-
-
-  instrumentation/opentelemetry-instrumentation-aio-pika:
-    - ofek1weiss
+  instrumentation/opentelemetry-instrumentation-aiokafka:
+    - dimastbk
 
-  instrumentation/opentelemetry-instrumentation-boto3sqs:
-    - oxeye-nikolay
-    - nikosokolik
-  
   instrumentation/opentelemetry-instrumentation-asyncclick:
     - jomcgi
 
-  instrumentation/opentelemetry-instrumentation-kafka-python:
-    - nozik
-  
-  instrumentation/opentelemetry-instrumentation-pika:
-    - oxeye-nikolay
-    - nikosokolik
-
-  instrumentation/opentelemetry-instrumentation-redis:
-    - sungwonh
-
-  instrumentation/opentelemetry-instrumentation-remoulade:
-    - ben-natan
-    - machine424
-
-  instrumentation/opentelemetry-instrumentation-confluent-kafka:
-    - oxeye-dorkolog
-    - dorkolog
-
-  propagator/opentelemetry-propagator-aws-xray:
-    - jj22ee
-
-  sdk-extension/opentelemetry-sdk-extension-aws:
-    - srprash
-    - jj22ee
-
-  instrumentation/opentelemetry-instrumentation-tortoiseorm:
-    - tonybaloney
+  instrumentation/opentelemetry-instrumentation-asyncio:
+    - bourbonkk
 
-  instrumentation/opentelemetry-instrumentation-tornado:
-    - shalevr
+  instrumentation/opentelemetry-instrumentation-pymssql:
+     - guillaumep
 
   instrumentation/opentelemetry-instrumentation-urllib:
     - shalevr
@@ -51,27 +18,6 @@ components:
   instrumentation/opentelemetry-instrumentation-urllib3:
     - shalevr
 
-  instrumentation/opentelemetry-instrumentation-sqlalchemy:
-    - shalevr
-
-  instrumentation/opentelemetry-instrumentation-cassandra:
-    - mattcontinisio
-
-  instrumentation/opentelemetry-instrumentation-asyncio:
-    - bourbonkk
-
-  instrumentation/opentelemetry-instrumentation-psycopg:
-    - federicobond
-
-  instrumentation/opentelemetry-instrumentation-pymssql:
-    - guillaumep
-
-  instrumentation/opentelemetry-instrumentation-aiokafka:
-    - dimastbk
-
-  processor/opentelemetry-processor-baggage:
-    - codeboten
-
   instrumentation-genai/:
     - karthikscale3
     - lmolkova
@@ -80,3 +26,17 @@ components:
     - nirga
     - alizenhom
     - codefromthecrypt
+
+  processor/opentelemetry-processor-baggage:
+    - codeboten
+
+  propagator/opentelemetry-propagator-aws-xray:
+    - jj22ee
+
+  sdk-extension/opentelemetry-sdk-extension-aws:
+    - srprash
+    - jj22ee
+
+  util/opentelemetry-util-genai:
+    - DylanRussell
+    - keith-decker