diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..f1abe3ad
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,13 @@
+# Org-Level Owners (in alphabetical order)
+* @justincormack 
+* @niazfk
+* @stevelasker
+
+# Repo-Level Owners (in alphabetical order)
+# Note: This is only for the notaryproject/notaryproject repo
+* @gokarnm
+* @priteshbandi
+* @shizhMSFT
+* @toddysm
+* @vaninrao10
+* @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index 9330fa54..a47ff1ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1 +1,18 @@
-Yi Zha <yizha1@microsoft.com> @yizha1
\ No newline at end of file
+<<<<<<< HEAD
+Yi Zha <yizha1@microsoft.com> @yizha1
+=======
+# Org-Level Maintainers (in alphabetical order)
+# Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
+Justin Cormack <justin.cormack@docker.com> (@justincormack)
+Niaz Khan <niazfk@amazon.com> (@niazfk)
+Steve Lasker <StevenLasker@hotmail.com> (@stevelasker)
+
+# Repo-Level Maintainers (in alphabetical order)
+# Note: This is for the notaryproject/notaryproject repo
+Milind Gokarn <gokarnm@amazon.com> (@gokarnm)
+Pritesh Bandi <priteshbandi@gmail.com> (@priteshbandi)
+Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)
+Toddy Mladenov <toddysm@gmail.com> (@toddysm)
+Vani Rao <vaninrao@amazon.com> (@vaninrao10)
+Yi Zha <yizha1@microsoft.com> @yizha1
+>>>>>>> 62ae4cf (Added CODEOWNERS and MAINTAINERS files (#240))