diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e2543cea139..92d1a202e63 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,26 +50,33 @@
 # PRLabel: %Azure.Identity
 /sdk/identity/           @heaths @RickWinter @LarryOsterman @chlowell
 
-###########
-# Client SDKs
-###########
-
-# AzureSDKOwners: @heaths
-# ServiceLabel: %Storage
-# PRLabel: %Storage
-/sdk/storage/           @heaths @RickWinter @LarryOsterman @vincenttran-msft @jalauzon-msft
+####################
+# Client Libraries
+####################
 
-# AzureSDKOwners: @heaths
-# ServiceOwner: @Pilchie
-# ServiceLabel: %Cosmos
 # PRLabel: %Cosmos
 /sdk/cosmos/             @analogrelay @Pilchie @kirankumarkolli @tvaron3 @FabianMeiswinkel @kundadebdatta @nehrao1 @kushagraThapar
 
-# ServiceOwner: @Azure/azure-sdk-write-keyvault
-# ServiceLabel: %KeyVault
+# ServiceLabel: %Cosmos
+# AzureSDKOwners: @heaths
+# ServiceOwners: @Pilchie
+
 # PRLabel: %KeyVault
 /sdk/keyvault/           @Azure/azure-sdk-write-keyvault @heaths
 
+# ServiceLabel: %KeyVault
+# ServiceOwners: @Azure/azure-sdk-write-keyvault
+
+# PRLabel: %Storage
+/sdk/storage/            @heaths @RickWinter @LarryOsterman @vincenttran-msft @jalauzon-msft
+
+# ServiceLabel: %Storage
+# AzureSDKOwners: @vincenttran-msft @jalauzon-msft
+
+####################
+# Management Libraries
+####################
+
 ###########
 # Eng Sys
 ###########