diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
index f7672739..91446d11 100644
--- a/.github/workflows/release-nightly.yml
+++ b/.github/workflows/release-nightly.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           distribution: goreleaser-pro
           version: latest
-          args: release --clean --nightly
+          args: release --clean --nightly -f .goreleaser-nightly.yml
         env:
           GITHUB_TOKEN: ${{secrets.GH_PAT}}
           GORELEASER_KEY: ${{secrets.GORELEASER_KEY}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f280214..5ae23dee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           distribution: goreleaser-pro
           version: latest
-          args: release --clean --draft
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{secrets.GH_PAT}}
           GORELEASER_KEY: ${{secrets.GORELEASER_KEY}}
diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
new file mode 100644
index 00000000..518ca951
--- /dev/null
+++ b/.goreleaser-nightly.yml
@@ -0,0 +1,16 @@
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+version: 2
+pro: true
+
+release:
+  draft: false
+  name_template: 'v{{.Version}}-nightly'
+
+nightly:
+  publish_release: true
+  keep_single_release: true
+  version_template: "{{incminor .Version}}-nightly"
+
+includes:
+  - from_file:
+      path: ./.goreleaser.yml
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 7bfd2f62..f976e42b 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -46,18 +46,13 @@ archives:
         formats: [zip]
 
 release:
-  name_template: 'v{{incminor .Version}}-nightly'
+  draft: true
 
 
 git:
   ignore_tags:
     - "{{if not .IsNightly}}nightly{{end}}"
 
-nightly:
-  publish_release: true
-  keep_single_release: true
-  version_template: "{{incminor .Version}}-nightly"
-
 snapshot:
   version_template: '{{.Version}}'