diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b525bfd297..6cca3e9057 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,10 @@
 # Centrifudge Code Owners
 
 ## Changes to .github
-.github/* @mikiquantum @mustermeiszer @branan @NunoAlexandre
+.github/* @mikiquantum @mustermeiszer @branan @NunoAlexandre @lemunozm
 
 ## Changes to ci
-ci/* @mikiquantum @mustermeiszer @branan @NunoAlexandre
+ci/* @mikiquantum @mustermeiszer @branan @NunoAlexandre @lemunozm
 
 ## Changes to the service of our chain.
 node/* @mikiquantum @mustermeiszer @branan @NunoAlexandre
@@ -12,9 +12,6 @@ node/* @mikiquantum @mustermeiszer @branan @NunoAlexandre
 ## Changes to chain-specs
 node/res/* @mikiquantum @mustermeiszer @branan @NunoAlexandre @wischli
 
-## Changes to toml files
-*.toml @mikiquantum @mustermeiszer @branan @NunoAlexandre @lemunozm @wischli @cdamian @thea-leake
-
 ## Changes to specific pallets
 pallets/liquidity-pools/* @NunoAlexandre @cdamian @wischli @mustermeiszer
 pallets/rewards/* @lemunozm @mikiquantum
diff --git a/.github/issue_template.md b/.github/issue_template.md
index 88eab1af26..24192d8aa1 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,15 +1,2 @@
-### Description
+# Description
 
-[Description of the issue or feature]
-
-### Research/based on
-
-[Which codebases, pallets or designs did you base your design on]
-
-### How will this affect the code base
-
-[Does it improve readability, performance? Will it introduce new complexity?]
-
-### What are foreseen obstacles or hurdles to overcome?
-
-[Are migrations needed, structural changes around testing etc?]
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 620f64f578..404c8c16d0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,16 +1,9 @@
 # Description
 
-Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
+[description]
 
-Fixes # (issue)
+Fixes #(issue)
 
 ## Changes and Descriptions
 
 [List your changes here]
-
-# Checklist:
-
-- [ ] I have added Rust doc comments to structs, enums, traits and functions
-- [ ] I have made corresponding changes to the documentation
-- [ ] I have performed a self-review of my code
-- [ ] I have added tests that prove my fix is effective or that my feature works