diff --git a/admin/grants.sql b/admin/grants.sql
index 4c8030f6..7a15649a 100644
--- a/admin/grants.sql
+++ b/admin/grants.sql
@@ -33,7 +33,7 @@ TO ROLE PUBLIC;
 
 -- GENIE privileges
 GRANT ROLE GENIE_ADMIN
-TO ROLE USERADMIN;
+TO ROLE SYSADMIN;
 GRANT ROLE GENIE_ADMIN
 TO USER "alexander.paynter@sagebase.org";
 GRANT ROLE GENIE_ADMIN
@@ -45,9 +45,9 @@ TO USER "rixing.xu@sagebase.org";
 
 -- RECOVER privileges
 GRANT ROLE RECOVER_DATA_ENGINEER
-TO ROLE USERADMIN;
+TO ROLE SYSADMIN;
 GRANT ROLE RECOVER_DATA_ANALYTICS
-TO ROLE USERADMIN;
+TO ROLE RECOVER_DATA_ENGINEER;
 GRANT ROLE RECOVER_DATA_ENGINEER
 TO USER "phil.snyder@sagebase.org";
 GRANT ROLE RECOVER_DATA_ENGINEER
@@ -59,7 +59,7 @@ TO USER RECOVER_SERVICE;
 
 -- AD privileges
 GRANT ROLE AD
-TO ROLE USERADMIN;
+TO ROLE SYSADMIN;
 GRANT ROLE AD
 TO USER "abby.vanderlinden@sagebase.org";
 GRANT ROLE AD
@@ -72,16 +72,20 @@ GRANT ROLE NF_ADMIN
 TO ROLE SYSADMIN;
 GRANT ROLE NF_ADMIN
 TO USER "anh.nguyet.vu@sagebase.org";
+GRANT ROLE NF_ADMIN
+TO USER "thomas.yu@sagebase.org";
 
 -- SCIDATA privileges
 GRANT ROLE SCIDATA_ADMIN
 TO ROLE SYSADMIN;
 GRANT ROLE SCIDATA_ADMIN
 TO USER "susheel.varma@sagebase.org";
+GRANT ROLE SCIDATA_ADMIN
+TO USER "thomas.yu@sagebase.org";
 
 -- Data engineer privileges
 GRANT ROLE DATA_ENGINEER
-TO ROLE USERADMIN;
+TO ROLE SYSADMIN;
 GRANT ROLE DATA_ENGINEER
 TO USER "phil.snyder@sagebase.org";
 GRANT ROLE DATA_ENGINEER
@@ -190,6 +194,10 @@ GRANT ROLE SAGE_LEADERS TO USER "brandon.morgan@sagebase.org";
 GRANT ROLE SAGE_LEADERS TO USER "thomas.yu@sagebase.org";
 GRANT ROLE SAGE_LEADERS TO USER "milen.nikolov@sagebase.org";
 GRANT ROLE DATA_ANALYTICS TO ROLE SAGE_LEADERS;
+GRANT ROLE DATA_ANALYTICS TO ROLE SCIDATA_ADMIN;
+GRANT ROLE DATA_ANALYTICS TO ROLE NF_ADMIN;
+GRANT ROLE DATA_ANALYTICS TO ROLE GENIE_ADMIN;
+GRANT ROLE DATA_ANALYTICS TO ROLE AD;
 
 GRANT ROLE FAIR TO USER "anthony.williams@sagebase.org";
 GRANT ROLE FAIR TO USER "loren.wolfe@sagebase.org";