diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b80cdd8..410d2d7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,3 @@
 .github/policies/ @Azure/avm-admins @Azure/avm-core-team-technical
 .github/workflows/version-check.yml @Azure/avm-admins @Azure/avm-core-team-technical
 .github/CODEOWNERS @Azure/avm-admins @Azure/avm-core-team-technical
-
-# No ownership for the rest of the files
-*
diff --git a/.github/policies/avmrequiredfiles.yml b/.github/policies/avmrequiredfiles.yml
index 1471590..b51b168 100644
--- a/.github/policies/avmrequiredfiles.yml
+++ b/.github/policies/avmrequiredfiles.yml
@@ -12,9 +12,13 @@ configuration:
       repository. A pull request has been opened to add the
       missing files. When the pr is merged this issue will be
       closed automatically.
-    prTitle: Adding AVM mandatory file(s) to this repo
+    prTitle: 'feat: add AVM mandatory file(s) to this repo'
     prBody: |
-      This repository needs the standard workflow files to ensure compliance.
+      This repository needs the standard workflow and policy files to ensure compliance.
     file:
       - path: .github/workflows/version-check.yml
         prContentLink: https://raw.githubusercontent.com/Azure/terraform-azurerm-avm-template/main/.github/workflows/version-check.yml
+      - path: .github/policies/avmrequiredfiles.yml
+        prContentLink: https://raw.githubusercontent.com/Azure/terraform-azurerm-avm-template/main/.github/policies/avmrequiredfiles.yml
+      - path: .github/policies/branchprotection.yml
+        prContentLink: https://raw.githubusercontent.com/Azure/terraform-azurerm-avm-template/main/.github/policies/branchprotection.yml