diff --git a/CODEOWNERS b/CODEOWNERS
index 6dc8228..5e86dab 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,5 @@
-# To be kept in sync with: [community/OWNERS](https://github.com/veraison/community/blob/main/OWNERS) 
-# and the GitHub Team: [go-cose-maintainers](https://github.com/orgs/veraison/teams/go-cose-maintainers)
+# Details:     https://github.com/veraison/community
+# Maintainers: https://github.com/orgs/veraison/teams/go-cose-maintainers
+#              https://github.com/orgs/veraison/teams/veraison-org-maintainers
 
-* @henkbirkholz @OR13 @qmuntal @roywill @setrofim @shizhMSFT @simonfrost-arm @SteveLasker @thomas-fossati @yogeshbdeshpande
+* @veraison/go-cose-maintainers @veraison/veraison-org-maintainers
diff --git a/SECURITY.md b/SECURITY.md
index d4ab969..33d164d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -86,4 +86,4 @@ Disclosures will be published on the same day as a release fixing the vulnerabil
 [go-cose]:                https://github.com/veraison/go-cose
 [security-advisories]:    https://github.com/veraison/go-cose/security/advisories
 [v1.0.0-release]:  https://github.com/veraison/go-cose/releases/tag/v1.0.0
-[go-cose-maintainers]:    https://github.com/veraison/community/blob/main/OWNERS
+[go-cose-maintainers]:    https://github.com/orgs/veraison/teams/go-cose-maintainers