diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 290b547f9b..9c245eb595 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,7 +20,8 @@
 /shared/ @patlo-iog @FabioPinheiro @mineme0110 @yshyn-iohk @bvoiturier @shotexa @CryptoKnightIOG
 
 # E2E tests:
-/tests/ @amagyar-iohk @yshyn-iohk @patlo-iog @mineme0110
+/tests/ @todorkoleviohk @amagyar-iohk @yshyn-iohk @patlo-iog @mineme0110
 
 # Docs:
-/docs/ @davidpoltorak-io @yshyn-iohk
+/docs/ @bvoiturier @yshyn-iohk
+*.md @petevielhaber
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index c989726ae9..8994571945 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
 To submit a new issue, please, use one of the following templates:
 
-https://github.com/input-output-hk/atala-prism-building-blocks/issues/new/choose
+https://github.com/hyperledger-labs/open-enterprise-agent/issues/new/choose
 
 Thank you!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b206291bcc..fced55d16d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,7 +6,7 @@ Link to any discussion, related issues and bug reports to give the context to he
 Link to existing ADR (Architecture Decision Record), if any. If relevant, describe other approaches explored and the selected approach. Documenting why the methods were not selected will create a knowledge base for future reference, helping prevent others from revisiting less optimal ideas.
 
 ### Checklist: 
-- [] My PR follows the contribution guidelines of this project
+- [] My PR follows the [contribution guidelines](https://github.com/hyperledger-labs/open-enterprise-agent/blob/main/CONTRIBUTING.md) of this project
 - [] My PR is free of third-party dependencies that don't comply with the [Allowlist](https://toc.hyperledger.org/governing-documents/allowed-third-party-license-policy.html#approved-licenses-for-allowlist)
 - [] I have commented my code, particularly in hard-to-understand areas
 - [] I have made corresponding changes to the documentation