diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index dc0ac17143..77f5b6e241 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       - name: Setup build env
         uses: ./.github/actions/setup-build-env
-        timeout-minutes: 20
+        timeout-minutes: 30
         with:
           build-cache-key: release-images
       - name: Run Trivy vulnerability scanner in repo mode
@@ -230,7 +230,7 @@ jobs:
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       - name: Setup build env
         uses: ./.github/actions/setup-build-env
-        timeout-minutes: 20
+        timeout-minutes: 30
       - uses: creekorful/goreportcard-action@1f35ced8cdac2cba28c9a2f2288a16aacfd507f9 # v1.0
       - name: Install Cosign
         uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 506f5400e2..1507aa0814 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -44,12 +44,12 @@ archives:
 - id: kyverno-cli-archive
   name_template: |-
      kyverno-cli_{{ .Tag }}_{{ .Os }}_
-     {{ - with .Arch - }}
-     {{ - if eq . "amd64" - }}x86_64{{- else if eq . "386" -}}i386{{- else -}}{{- . -}}{{- end -}}
-     {{ - end - }}
-     {{ - with .Arm - }}
-     {{ - if eq . "6" - }}hf{{- else -}}v{{- . -}}{{- end -}}
-     {{ - end - }}
+     {{- with .Arch -}}
+     {{- if eq . "amd64" -}}x86_64{{- else if eq . "386" -}}i386{{- else -}}{{- . -}}{{- end -}}
+     {{- end -}}
+     {{- with .Arm -}}
+     {{- if eq . "6" -}}hf{{- else -}}v{{- . -}}{{- end -}}
+     {{- end -}}
   builds:
     - kyverno-cli
   format_overrides: