diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index ae74e34ea..649933d1c 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -13,7 +13,9 @@ categories:
   - title: 'Maintenance'
     label: 'chore'
   - title: 'Dependencies'
-    label: 'dependencies'
+    collapse-after: 3
+    labels:
+      - 'dependencies'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 change-title-escapes: '\<*_&'
 version-resolver:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 521840d8d..6c82b7b5f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+-*'
       
 permissions:
-  contents: write  # Allows creating releases
+  contents: write
   issues: read
   pull-requests: read  
 jobs:
@@ -118,15 +118,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Set pre-release flag
-        id: prerelease
-        run: |
-          if [[ "${{ github.ref }}" =~ -[a-zA-Z0-9]+$ ]]; then
-            echo "prerelease=true" >> $GITHUB_OUTPUT
-          else
-            echo "prerelease=false" >> $GITHUB_OUTPUT
-          fi
-
       - name: Install GPG
         run: sudo apt-get update && sudo apt-get install -y gnupg
 
@@ -168,5 +159,4 @@ jobs:
           GPG_FINGERPRINT: ${{ env.GPG_FINGERPRINT }}
           HOMEBREW_CLI_WRITE_PAT: ${{ secrets.HOMEBREW_CLI_WRITE_PAT }}
           GITHUB_SHA: ${{ github.sha }}
-          PRERELEASE: ${{ steps.prerelease.outputs.prerelease }}
           SKIP_HOMEBREW: ${{ steps.prerelease.outputs.prerelease == 'true' }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index f33bcff0e..4bc428f6e 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -44,7 +44,7 @@ release:
     owner: windsorcli
     name: cli
   draft: false
-  prerelease: false
+  prerelease: auto
 
 binary_signs:
   - cmd: gpg
@@ -62,7 +62,7 @@ signs:
 brews:
   - name: windsor
     directory: Formula
-    skip_upload: false
+    skip_upload: "{{ eq .Env.SKIP_HOMEBREW \"true\" }}"
     repository:
       owner: windsorcli
       name: homebrew-cli