diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 86d1175..b529ae5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,11 +1,10 @@
-<<<<<<< HEAD
-# Default owner for all files
-=======
-modules/data-layer/        @oscarbaateel
-modules/orchestrator/      @adriancon
-modules/strategy-agent/    @antoniosoto
-modules/dr-anticorruption/ @briancollado
-modules/supplychain-risk/  @karlkohler
+# Module Owners
+# modules/data-layer/        
+modules/orchestrator/      @Acon3078
+modules/strategy-agent/    @asotogrande
+modules/dr-anticorruption/ @Bcollado0310
+modules/supplychain-risk/  @karlmaximilienkohler
 modules/policy-simulator/  @andresgerli
->>>>>>> 37a173c (Repo setup: module skeleton, docs, templates, gitignore)
-* @OscarDiez
+
+# Default Owners 
+* @OscarDiez @Acon3078
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 7d8291d..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Summary
-Explain what changed and why.
-
-## Checklist
-- [ ] No secrets/credentials committed
-- [ ] Docs updated (if needed)
-- [ ] Tests added/updated (if applicable)