From 8646947019594322103ffb95308be70269ecb91e Mon Sep 17 00:00:00 2001
From: JorgeIglesiasMosquera
 <39564597+JorgeIglesiasMosquera@users.noreply.github.com>
Date: Wed, 29 Jul 2026 11:15:42 +0200
Subject: [PATCH 1/2] fix: update BootstrapFile.yaml.example

---
 .../boot/BootstrapFile.yaml.example           | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/firestartr-bootstrap/boot/BootstrapFile.yaml.example b/firestartr-bootstrap/boot/BootstrapFile.yaml.example
index 17f0187f..59dd88db 100644
--- a/firestartr-bootstrap/boot/BootstrapFile.yaml.example
+++ b/firestartr-bootstrap/boot/BootstrapFile.yaml.example
@@ -1,11 +1,19 @@
-defaultSystemName: # ask customer for a default system name to be used in the claims, for example "mysystem"
-defaultGroup: # ask customer for the owner of the default system and domain
+org: <github org name> # github org name
+customer: <customer name> # customer name used for Firestartr internally, for example to find secrets within the parameter store
+env: <environment> # set either "pre" for firestartr-pre or "pro" for firestartr-pro
+defaultOrgPermissions: <none | view | contribute> # default permissions for the <org>-all group, can be none, view or contribute
+defaultBranch: main
+defaultBranchStrategy: none
+defaultDomainName: <default domain name> # ask customer for a default domain name to be used in the claims, for example "myproduct"
+defaultSystemName: <default system name> # ask customer for a default system name to be used in the claims, for example "mysystem"
+defaultGroup: <default group> # ask customer for the owner of the default system and domain
 defaultFirestartrGroup: firestartr # default group for firestartr users and related components (claims, state-github, state-infra...)
 
 firestartr:
   # Check latest available release at github.com/prefapp/gitops-k8s
-  operator: v1.56.1
-  cli: v1.56.1
+  operator: <operator_version> # Ex. v1.56.1
+  cli: <cli_version> # Ex. v1.56.1
+
 pushFiles:
   claims:
     push: true # When the process finishes, the generated claims will be pushed to the claims repository.
@@ -49,6 +57,8 @@ components:
     variables:
       - name: "FS_IMPORT_APP_ID"
         value: "ref:secretsclaim:firestartr-secrets:fs-import-appid"
+    labels:
+      - automerge
 
   - name: "catalog"
     description: "Firestartr configuration folders and files"
@@ -63,6 +73,8 @@ components:
     features:
       - name: state_github
         version: latest  # Check available versions at github.com/prefapp/features
+    labels:
+      - plan
 
   - name: "state-infra"
     description: "Firestartr Terraform workspaces wet repository"

From 2a9d10f27dd909154cf577244ed8e03477d10edc Mon Sep 17 00:00:00 2001
From: JorgeIglesiasMosquera
 <39564597+JorgeIglesiasMosquera@users.noreply.github.com>
Date: Wed, 29 Jul 2026 11:56:04 +0200
Subject: [PATCH 2/2] Update BootstrapFile.yaml.example

---
 firestartr-bootstrap/boot/BootstrapFile.yaml.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firestartr-bootstrap/boot/BootstrapFile.yaml.example b/firestartr-bootstrap/boot/BootstrapFile.yaml.example
index 59dd88db..2f493a3c 100644
--- a/firestartr-bootstrap/boot/BootstrapFile.yaml.example
+++ b/firestartr-bootstrap/boot/BootstrapFile.yaml.example
@@ -11,8 +11,8 @@ defaultFirestartrGroup: firestartr # default group for firestartr users and rela
 
 firestartr:
   # Check latest available release at github.com/prefapp/gitops-k8s
-  operator: <operator_version> # Ex. v1.56.1
-  cli: <cli_version> # Ex. v1.56.1
+  operator: <operator_version> # Ex. v1.56.1 or "latest"
+  cli: <cli_version> # Ex. v1.56.1 or "latest"
 
 pushFiles:
   claims: