diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 6018ed7b41..3420219f4c 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -42,7 +42,7 @@ Triagers are contributors who assist in managing and organizing issues and pull
 
 ## Github Project Administration
 
-Maintainers will be added to the collaborators list of the Cortex repository with "Write" access.
+Maintainers will be added to the collaborators list of the Cortex repository with "Write" access while Triagers will be added to the collaborators list of the Cortex repository with "Triage" access.
 
 After 6 months a maintainer will be given "Admin" access to the Cortex repository.
 
@@ -50,6 +50,10 @@ After 6 months a maintainer will be given "Admin" access to the Cortex repositor
 
 All changes in Governance require a 2/3 majority vote.
 
+## Cortex Team
+
+${Maintainers}
+
 ## Other Changes
 
 Unless specified above, all other changes to the project require a 2/3 majority vote.
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 1bedc4815d..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-Alan Protasio, Amazon Web Services <alanprot@gmail.com> (@alanprot)
-Ben Ye, Amazon Web Services <yb532204897@gmail.com> (@yeya24)
-Charlie Le, Apple <chtle4@gmail.com> (@CharlieTLe)
-Daniel Blando, Amazon Web Services <daniel@blando.com.br> (@danielblando)
-Friedrich Gonzalez, Adobe <friedrichg@gmail.com> (@friedrichg)
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
index 0000000000..062ff67d03
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,9 @@
+### Maintainers
+
+| Name               | Email                 | GitHub        | Company             |
+|--------------------|-----------------------|---------------|---------------------|
+| Alan Protasio      | alanprot@gmail.com    | @alanprot     | Amazon Web Services |
+| Ben Ye             | yb532204897@gmail.com | @yeya24       | Amazon Web Services |
+| Charlie Le         | chtle4@gmail.com>     | @CharlieTLe   | Apple               |
+| Daniel Blando      | daniel@blando.com.br  | @danielblando | Amazon Web Services |
+| Friedrich Gonzalez | friedrichg@gmail.com  | @friedrichg   | Adobe               |
\ No newline at end of file
diff --git a/tools/website/web-pre.sh b/tools/website/web-pre.sh
index 97e31ef8f5..6c1dd3c597 100755
--- a/tools/website/web-pre.sh
+++ b/tools/website/web-pre.sh
@@ -15,7 +15,7 @@ mkdir -p ${OUTPUT_CONTENT_DIR}
 # Copy original content.
 cp -r ${ORIGINAL_CONTENT_DIR}/* ${OUTPUT_CONTENT_DIR}
 cp -r code-of-conduct.md CHANGELOG.md ${OUTPUT_CONTENT_DIR}
-cp GOVERNANCE.md ${OUTPUT_CONTENT_DIR}/contributing/governance.md
+Maintainers=`cat MAINTAINERS.md` envsubst <  GOVERNANCE.md >> ${OUTPUT_CONTENT_DIR}/contributing/governance.md
 cp images/* ${WEBSITE_DIR}/static/images
 
 # Add headers to special CODE_OF_CONDUCT.md, CHANGELOG.md and README.md files.
@@ -50,7 +50,7 @@ weight: 1
 ---
 EOT
 )" > ${OUTPUT_CONTENT_DIR}/contributing/governance.md
-tail -n +2 GOVERNANCE.md >> ${OUTPUT_CONTENT_DIR}/contributing/governance.md
+Maintainers=`cat MAINTAINERS.md` envsubst < GOVERNANCE.md | tail -n +2 >> ${OUTPUT_CONTENT_DIR}/contributing/governance.md
 
 echo "$(cat <<EOT
 ---