diff --git a/CODEOWNERS b/CODEOWNERS
index 95d92cc98..757acfb8d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,10 +3,12 @@
 /repo/packages/C/cassandra/ @kaiwalyajoshi
 /repo/packages/C/confluent-*/ @kaiwalyajoshi
 /repo/packages/D/datastax-*/ @kaiwalyajoshi
-/repo/packages/D/data-science-engine/ @akirillov 
+/repo/packages/D/data-science-engine/ @akirillov
 /repo/packages/D/dcos-core-cli/ @janisz @pierrebeitz @DominikDary
 /repo/packages/D/dcos-enterprise-cli/ @janisz @pierrebeitz @DominikDary
 /repo/packages/E/elastic/ @kaiwalyajoshi
+/repo/packages/E/edgelb/ @jkoelker @wavesoft
+/repo/packages/E/edgelb-pool/ @jkoelker @wavesoft
 /repo/packages/H/hdfs/ @kaiwalyajoshi
 /repo/packages/H/hello-world/ @kaiwalyajoshi
 /repo/packages/H/hive-metastore/ @kaiwalyajoshi
@@ -16,5 +18,5 @@
 /repo/packages/M/marathon/ @timcharper @jeschkies
 /repo/packages/N/nifi/ @alexeygorobets @kaiwalyajoshi
 /repo/packages/P/portworx-*/ @kaiwalyajoshi
-/repo/packages/S/spark/ @alexeygorobets  
-/repo/packages/S/spark-history/ @alexeygorobets 
+/repo/packages/S/spark/ @alexeygorobets
+/repo/packages/S/spark-history/ @alexeygorobets