diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..ec8954cad
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,3 @@
+# Owners (in alphabetical order)
+# Note: This is only for the notaryproject/notary repo and includes the Org level maintainers
+* @hukeping @jonnystoten @niazfk @priteshbandi @shizhMSFT @toddysm @vaninrao10 @yizha1
\ No newline at end of file
diff --git a/MAINTAINERS b/MAINTAINERS
index 4650dadef..2d07054a0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9,9 +9,12 @@
 [Org]
 	[Org."Org maintainers"]
 		people = [
-			"justincormack",
 			"niazfk",
-			"stevelasker",
+			"priteshbandi",
+			"shiweizhang",
+			"toddymladenov",
+			"vaninrao",
+			"yizha"
 		]
 
 	[Org."Notary maintainers"]
@@ -20,19 +23,6 @@
 			"justincormack",
 			"jonnystoten"
 		]
-
-	[Org."Notation maintainers"]
-		people = [
-			"justincormack",
-			"niazfk",
-			"stevelasker",
-		]
-
-	[Org."TUF maintainers"]
-		people = [
-			"justincormack",
-			"mnm678",
-		]
 [people]
 
 # A reference list of all people associated with the project.
@@ -46,11 +36,6 @@
 	Email = "hukeping@huawei.com"
 	GitHub = "hukeping"
 
-	[people.justincormack]
-	Name = "Justin Cormack"
-	Email = "justin.cormack@docker.com"
-	GitHub = "justincormack"
-
 	[people.mnm678]
 	Name = "Marina Moore"
 	Email = "mm9693@nyu.edu"
@@ -61,12 +46,32 @@
 	Email = "niazfk@amazon.com"
 	GitHub = "niazfk"
 
-	[people.stevelasker]
-	Name = "Steve Lasker"
-	Email = "Steve.Lasker@microsoft.com"
-	GitHub = "stevelasker"
-
 	[people.jonnystoten]
 	Name = "Jonny Stoten"
 	Email = "jonny.stoten@docker.com"
 	GitHub = "jonnystoten"
+
+	[people.priteshbandi]
+	Name = "Pritesh Bandi"
+	Email = "priteshbandi@gmail.com"
+	GitHub = "priteshbandi"
+
+	[people.shiweizhang]
+	Name = "Shiwei Zhang"
+	Email = "shizh@microsoft.com"
+	GitHub = "shizhMSFT"
+
+	[people.toddymladenov]
+	Name = "Toddy Mladenov"
+	Email = "toddysm@gmail.com"
+	GitHub = "toddysm"
+
+	[people.vaninrao]
+	Name = "Vani Rao"
+	Email = "vaninrao@amazon.com"
+	GitHub = "vaninrao10"
+
+	[people.vaninrao]
+	Name = "Vani Rao"
+	Email = "vaninrao@amazon.com"
+	GitHub = "vaninrao10"
diff --git a/MAINTAINERS.ALUMNI b/MAINTAINERS.ALUMNI
index 77e7ea6b1..ff4e133c0 100644
--- a/MAINTAINERS.ALUMNI
+++ b/MAINTAINERS.ALUMNI
@@ -14,8 +14,10 @@
 			"dmcgowan",
 			"endophage",
 			"ecordell",
+			"justincormack"
 			"nathanmccauley",
 			"riyazdf",
+			"stevelasker"
 		]
 
 [people]
@@ -47,6 +49,11 @@
 	Email = "evan.cordell@coreos.com"
 	GitHub = "ecordell"
 
+	[people.justincormack]
+	Name = "Justin Cormack"
+	Email = "justin.cormack@docker.com"
+	GitHub = "justincormack"
+
 	[people.nathanmccauley]
 	Name = "Nathan McCauley"
 	Email = "nathan.mccauley@docker.com"
@@ -56,3 +63,8 @@
 	Name = "Riyaz Faizullabhoy"
 	Email = "riyazdf@berkeley.edu"
 	GitHub = "riyazdf"
+
+	[people.stevelasker]
+	Name = "Steve Lasker"
+	Email = "Steve.Lasker@microsoft.com"
+	GitHub = "stevelasker"