From 06d69b468237e06b5573b95389c6af78980a455f Mon Sep 17 00:00:00 2001
From: juanjosevazquezgil
 <123170708+juanjosevazquezgil@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:08:43 +0200
Subject: [PATCH 1/2] fix: Bootstrap defaults

---
 .../templates/crs_config/expander_branch_strategies.tmpl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From dec633067b6d2475a209c89a6c10cba7cde695b4 Mon Sep 17 00:00:00 2001
From: juanjosevazquezgil
 <123170708+juanjosevazquezgil@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:11:25 +0200
Subject: [PATCH 2/2] Update components.tmpl

---
 firestartr-bootstrap/templates/components.tmpl | 3 +++
 1 file changed, 3 insertions(+)

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