From f6e2cbeb201e30528e72be5003b9aa4ebc7d8dd3 Mon Sep 17 00:00:00 2001
From: Ivan Khropachov <ivan@flamingo.cx>
Date: Wed, 8 Jul 2026 10:57:07 +0300
Subject: [PATCH 1/4] Remove template

---
 .github/pull_request_template.md | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 49ab615e8b8..00000000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## Description
-<!-- Provide a clear, concise description of what this PR changes -->
-
-## Improvements
-- <!-- Step by step improvements -->
--
-
-## Task
-[Link](https://app.clickup.com/t/example)
-<!-- Links to any related tickets, issues, or requirements -->

From def96299b402b1b586f2ce3a4cc5d14dbd32efeb Mon Sep 17 00:00:00 2001
From: Ivan Khropachov <ivan@flamingo.cx>
Date: Wed, 8 Jul 2026 22:10:45 +0300
Subject: [PATCH 2/4] Fix Fleet version release

---
 .github/workflows/release.yml | 1 +
 .github/workflows/version.yml | 1 -
 .goreleaser.yml               | 5 -----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fc48b2cd196..7a5d994b16c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -235,6 +235,7 @@ jobs:
     name: "Create Release"
     needs: [version, changes, build, build_client, build_helm]
     runs-on: ubuntu-latest
+    if: ${{ !failure() && !cancelled() }} 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index e44655e958c..be5228daa65 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -33,7 +33,6 @@ jobs:
         env:
           INPUT_VERSION: ${{ inputs.version }}
           GH_TOKEN: ${{ github.token }}
-          GH_REPO: ${{ github.repository }}
         run: |
           set -euo pipefail
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 90a7037f943..b393ac00ea9 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -92,8 +92,3 @@ docker_manifests:
     image_templates:
       - "{{ .Env.REGISTRY }}/{{ .Env.GITHUB_REPOSITORY }}/fleet:{{ .Env.DOCKER_TAG }}-amd64"
       - "{{ .Env.REGISTRY }}/{{ .Env.GITHUB_REPOSITORY }}/fleet:{{ .Env.DOCKER_TAG }}-arm64"
-  - name_template: "{{ .Env.REGISTRY }}/{{ .Env.GITHUB_REPOSITORY }}/fleet:latest"
-    image_templates:
-      - "{{ .Env.REGISTRY }}/{{ .Env.GITHUB_REPOSITORY }}/fleet:{{ .Env.DOCKER_TAG }}-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .Env.GITHUB_REPOSITORY }}/fleet:{{ .Env.DOCKER_TAG }}-arm64"
-    skip_push: "{{ if or (eq .Env.DOCKER_PUSH \"false\") (eq .Env.DOCKER_TAG \"latest\") }}true{{ else }}false{{ end }}"

From 33fa6b218327793787ecbbb28b3a1f1cec85c9d7 Mon Sep 17 00:00:00 2001
From: Ivan Khropachov <ivan@flamingo.cx>
Date: Wed, 8 Jul 2026 22:11:06 +0300
Subject: [PATCH 3/4] Fix Fleet version release

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7a5d994b16c..d3615e56d95 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -224,7 +224,7 @@ jobs:
         with:
           name: fleet
           repository: ${{ github.repository }}/helm-charts
-          tag: ${{ needs.version.outputs.version }}
+          tag: ${{ needs.version.outputs.version == 'latest' && '9.9.9' || needs.version.outputs.version }}
           path: ./charts/fleet
           registry: ${{ env.REGISTRY }}
           registry_username: ${{ github.actor }}

From 49537a559edd1858b25c7d7908b038cc7fe63b84 Mon Sep 17 00:00:00 2001
From: Ivan Khropachov <ivan@flamingo.cx>
Date: Wed, 8 Jul 2026 22:15:17 +0300
Subject: [PATCH 4/4] Test release flow

---
 charts/fleet/values.yaml     | 1 +
 go.sum                       | 1 +
 orbit/goreleaser-windows.yml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index 00e6ab69dea..db8e3a10b49 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -385,3 +385,4 @@ mysql:
 
 redis:
   enabled: false
+
diff --git a/go.sum b/go.sum
index 3c545e6d0e8..710cf9fda0a 100644
--- a/go.sum
+++ b/go.sum
@@ -1215,3 +1215,4 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
 software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
+
diff --git a/orbit/goreleaser-windows.yml b/orbit/goreleaser-windows.yml
index a8982784bdc..4d06894deee 100644
--- a/orbit/goreleaser-windows.yml
+++ b/orbit/goreleaser-windows.yml
@@ -44,3 +44,4 @@ snapshot:
 
 changelog:
   disable: true
+