diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..128e8e39
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @prowler-team
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b7685ea6..73692ae0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1 +1,13 @@
+### Context 
+
+Please include relevant motivation and context for this PR.
+
+
+### Description
+
+Please include a summary of the change and which issue is fixed. List any dependencies that are required for this change.
+
+
+### License
+
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.