diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 924116ee8..89ab8b0a2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-07-05T14:53:41Z by kres 8c8b007.
+# Generated on 2024-07-08T11:54:59Z by kres 8c8b007.
 
 name: default
 concurrency:
@@ -3038,7 +3038,7 @@ jobs:
     runs-on:
       - self-hosted
       - talos
-    if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && github.event_name != 'pull_request'
+    if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/')
     steps:
       - name: gather-system-info
         id: system-info
diff --git a/.kres.yaml b/.kres.yaml
index cef9af6b8..ed76942d6 100644
--- a/.kres.yaml
+++ b/.kres.yaml
@@ -136,6 +136,7 @@ spec:
         - talos
       conditions:
         - except-pull-request
+        - not-on-tag
       steps:
         - name: build
           command: talosctl-all kernel sd-boot sd-stub initramfs installer imager talos
diff --git a/Makefile b/Makefile
index 9fc0c38de..505782aba 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ NAME = Talos
 CLOUD_IMAGES_EXTRA_ARGS ?= ""
 ZSTD_COMPRESSION_LEVEL ?= 18
 
-CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
+CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 -- HEAD^2 | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
 
 ARTIFACTS := _out
 TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-6-g31ad71b