diff --git a/admin/grants.sql b/admin/grants.sql
index ce26ae10..19142f66 100644
--- a/admin/grants.sql
+++ b/admin/grants.sql
@@ -119,7 +119,6 @@ GRANT ROLE DATA_ANALYTICS TO USER "christine.suver@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "adam.taylor@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "sophia.jobe@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "thomas.schaffter@sagebase.org";
-GRANT ROLE DATA_ANALYTICS TO USER "jake.albrecht@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "solly.sieberts@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "arti.singh@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "dan.lu@sagebase.org";
@@ -134,7 +133,6 @@ GRANT ROLE DATA_ANALYTICS TO USER "richard.yaxley@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "ashley.clayton@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "verena.chung@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "jineta.banerjee@sagebase.org";
-GRANT ROLE DATA_ANALYTICS TO USER "sarah.chan@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "jenny.medina@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "lakaija.johnson@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "sonia.carlson@sagebase.org";
@@ -159,6 +157,7 @@ GRANT ROLE DATA_ANALYTICS TO USER "kimberly.corrigan@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "mackenzie.wildman@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "aditi.gopalan@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER "angie.bowen@sagebase.org";
+GRANT ROLE DATA_ANALYTICS TO USER "aditya.nath@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO USER AD_SERVICE;
 
 // Leaders
diff --git a/admin/users.sql b/admin/users.sql
index b973c341..766e637e 100644
--- a/admin/users.sql
+++ b/admin/users.sql
@@ -1,51 +1,66 @@
 USE ROLE USERADMIN;
+
+// Platform
 CREATE USER IF NOT EXISTS "diep.thach@sagebase.org";
-CREATE USER IF NOT EXISTS "anh.nguyet.vu@sagebase.org";
-CREATE USER IF NOT EXISTS "xindi.guo@sagebase.org";
-CREATE USER IF NOT EXISTS "abby.vanderlinden@sagebase.org";
-CREATE USER IF NOT EXISTS "chelsea.nayan@sagebase.org";
-CREATE USER IF NOT EXISTS "alexander.paynter@sagebase.org";
 CREATE USER IF NOT EXISTS "x.schildwachter@sagebase.org";
-CREATE USER IF NOT EXISTS "natosha.edmonds@sagebase.org";
 CREATE USER IF NOT EXISTS "kevin.boske@sagebase.org";
-CREATE USER IF NOT EXISTS "robert.allaway@sagebase.org";
-CREATE USER IF NOT EXISTS "victor.baham@sagebase.org";
-CREATE USER IF NOT EXISTS "meghasyam@sagebase.org";
-CREATE USER IF NOT EXISTS "pranav.anbarasu@sagebase.org";
-CREATE USER IF NOT EXISTS "elias.chaibub.neto@sagebase.org";
 CREATE USER IF NOT EXISTS "john.hill@sagebase.org";
 CREATE USER IF NOT EXISTS "bruce.hoff@sagebase.org";
 CREATE USER IF NOT EXISTS "marco.marasca@sagebase.org";
 CREATE USER IF NOT EXISTS "sandhra.sokhal@sagebase.org";
 CREATE USER IF NOT EXISTS "adam.hindman@sagebase.org";
-CREATE USER IF NOT EXISTS "jessica.malenfant@sagebase.org";
-CREATE USER IF NOT EXISTS "ann.novakowski@sagebase.org";
-CREATE USER IF NOT EXISTS "adam.taylor@sagebase.org";
-CREATE USER IF NOT EXISTS "angie.bowen@sagebase.org";
-CREATE USER IF NOT EXISTS "solly.sieberts@sagebase.org";
-CREATE USER IF NOT EXISTS "arti.singh@sagebase.org";
-CREATE USER IF NOT EXISTS "jessica.britton@sagebase.org";
-CREATE USER IF NOT EXISTS "christina.conrad@sagebase.org";
-CREATE USER IF NOT EXISTS "drew.duglan@sagebase.org";
-CREATE USER IF NOT EXISTS "zoe.leanza@sagebase.org";
 CREATE USER IF NOT EXISTS "jay.hodgson@sagebase.org";
-CREATE USER IF NOT EXISTS "milan.vu@sagebase.org";
-CREATE USER IF NOT EXISTS "richard.yaxley@sagebase.org";
-CREATE USER IF NOT EXISTS "ashley.clayton@sagebase.org";
-CREATE USER IF NOT EXISTS "jineta.banerjee@sagebase.org";
-CREATE USER IF NOT EXISTS "sarah.chan@sagebase.org";
 CREATE USER IF NOT EXISTS "nick.grosenbacher@sagebase.org";
 CREATE USER IF NOT EXISTS "khai.do@sagebase.org";
+CREATE USER IF NOT EXISTS "thomas.schaffter@sagebase.org";
+
+
+// Cancer Bio
+CREATE USER IF NOT EXISTS "adam.taylor@sagebase.org";
+CREATE USER IF NOT EXISTS "chelsea.nayan@sagebase.org";
+CREATE USER IF NOT EXISTS "xindi.guo@sagebase.org";
+CREATE USER IF NOT EXISTS "alexander.paynter@sagebase.org";
+CREATE USER IF NOT EXISTS "angie.bowen@sagebase.org";
+CREATE USER IF NOT EXISTS "ashley.clayton@sagebase.org";
 CREATE USER IF NOT EXISTS "lakaija.johnson@sagebase.org";
-CREATE USER IF NOT EXISTS "sonia.carlson@sagebase.org";
 CREATE USER IF NOT EXISTS "amber.nelson@sagebase.org";
 CREATE USER IF NOT EXISTS "tiara.adams@sagebase.org";
-CREATE USER IF NOT EXISTS "william.poehlman@sagebase.org";
 CREATE USER IF NOT EXISTS "jessica.vera@sagebase.org";
+CREATE USER IF NOT EXISTS "aditya.nath@sagebase.org";
+
+// ADTR
+CREATE USER IF NOT EXISTS "abby.vanderlinden@sagebase.org";
+CREATE USER IF NOT EXISTS "victor.baham@sagebase.org";
+CREATE USER IF NOT EXISTS "jessica.malenfant@sagebase.org";
+CREATE USER IF NOT EXISTS "jessica.britton@sagebase.org";
+CREATE USER IF NOT EXISTS "zoe.leanza@sagebase.org";
+CREATE USER IF NOT EXISTS "milan.vu@sagebase.org";
+CREATE USER IF NOT EXISTS "richard.yaxley@sagebase.org";
+CREATE USER IF NOT EXISTS "william.poehlman@sagebase.org";
+
+// NF
+CREATE USER IF NOT EXISTS "anh.nguyet.vu@sagebase.org";
+CREATE USER IF NOT EXISTS "robert.allaway@sagebase.org";
+CREATE USER IF NOT EXISTS "christina.conrad@sagebase.org";
+CREATE USER IF NOT EXISTS "jineta.banerjee@sagebase.org";
 CREATE USER IF NOT EXISTS "aditi.gopalan@sagebase.org";
+
+
+// Digital Health
+CREATE USER IF NOT EXISTS "solly.sieberts@sagebase.org";
+CREATE USER IF NOT EXISTS "meghasyam@sagebase.org";
+CREATE USER IF NOT EXISTS "pranav.anbarasu@sagebase.org";
+CREATE USER IF NOT EXISTS "elias.chaibub.neto@sagebase.org";
+CREATE USER IF NOT EXISTS "arti.singh@sagebase.org";
+CREATE USER IF NOT EXISTS "sonia.carlson@sagebase.org";
+
+
+// Governance
+CREATE USER IF NOT EXISTS "natosha.edmonds@sagebase.org";
+CREATE USER IF NOT EXISTS "ann.novakowski@sagebase.org";
+CREATE USER IF NOT EXISTS "kimberly.corrigan@sagebase.org";
+
 // CNB
-CREATE USER IF NOT EXISTS "thomas.schaffter@sagebase.org";
-CREATE USER IF NOT EXISTS "jake.albrecht@sagebase.org";
 CREATE USER IF NOT EXISTS "verena.chung@sagebase.org";
 CREATE USER IF NOT EXISTS "rchai@sagebase.org";
 CREATE USER IF NOT EXISTS "maria.diaz@sagebase.org";
@@ -70,8 +85,7 @@ CREATE USER IF NOT EXISTS "jenny.medina@sagebase.org";
 CREATE USER IF NOT EXISTS "phil.snyder@sagebase.org";
 CREATE USER IF NOT EXISTS "sophia.jobe@sagebase.org";
 CREATE USER IF NOT EXISTS "dan.lu@sagebase.org";
-// governance
-CREATE USER IF NOT EXISTS "kimberly.corrigan@sagebase.org";
+
 // LT
 CREATE USER IF NOT EXISTS "kim.baggett@sagebase.org";
 CREATE USER IF NOT EXISTS "luca.foschini@sagebase.org";
@@ -80,6 +94,7 @@ CREATE USER IF NOT EXISTS "susheel.varma@sagebase.org";
 CREATE USER IF NOT EXISTS "christine.suver@sagebase.org";
 CREATE USER IF NOT EXISTS "anna.greenwood@sagebase.org";
 CREATE USER IF NOT EXISTS "mackenzie.wildman@sagebase.org";
+CREATE USER IF NOT EXISTS "drew.duglan@sagebase.org";
 
 // finance
 CREATE USER IF NOT EXISTS "brandon.morgan@sagebase.org";