diff --git a/firestartr-bootstrap/templates/components.tmpl b/firestartr-bootstrap/templates/components.tmpl
index 936c78c4..08cda8ae 100644
--- a/firestartr-bootstrap/templates/components.tmpl
+++ b/firestartr-bootstrap/templates/components.tmpl
@@ -16,6 +16,9 @@ providers:
     name: {{ default $claim.Name $claim.RepoName }}
     org: {{ $.Org }}
     visibility: private
+    allowAutoMerge: true
+    deleteBranchOnMerge: true
+    allowUpdateBranch: true
     actions:
       oidc:
         useDefault: true
diff --git a/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl b/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
index 654765c6..4a15af1f 100644
--- a/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
+++ b/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
@@ -12,6 +12,6 @@ expanderValues:
               - "pr_verify"
             requiredReviewersCount: 2
             requiredCodeownersReviewers: false
-            enforceAdmins: true
+            enforceAdmins: false
             requireSignedCommits: true
             requireConversationResolution: false