diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca61004fd..e1d9987da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,9 +29,23 @@ jobs:
       - name: Test
         run: go test ./...
 
-  nightly:
-    uses: charmbracelet/meta/.github/workflows/nightly.yml@main
-    secrets:
-      docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
-      docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
-      goreleaser_key: ${{ secrets.GORELEASER_KEY }}
+  goreleaser:
+    env:
+      GO111MODULE: "on"
+      DOCKER_CLI_EXPERIMENTAL: enabled
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "~1.17"
+      - uses: actions/checkout@v2
+      - uses: anchore/sbom-action/download-syft@v0.6.0
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
+      - uses: goreleaser/goreleaser-action@v2
+        with:
+          distribution: goreleaser-pro
+          version: latest
+          args: --snapshot --skip-sign
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
\ No newline at end of file
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
new file mode 100644
index 000000000..28f61f76a
--- /dev/null
+++ b/.github/workflows/nightly.yml
@@ -0,0 +1,14 @@
+name: nightly
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  nightly:
+    uses: charmbracelet/meta/.github/workflows/nightly.yml@main
+    secrets:
+      docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
+      goreleaser_key: ${{ secrets.GORELEASER_KEY }}
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
deleted file mode 100644
index e9356a5af..000000000
--- a/.github/workflows/pr-comment.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: pr-comment
-
-on:
-  workflow_run:
-    workflows: [build]
-    types: [completed]
-
-jobs:
-  pr-comment:
-    uses: charmbracelet/meta/.github/workflows/pr-comment.yml@main
diff --git a/README.md b/README.md
index bdc4d185d..f226046e9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Soft Serve
     </picture><br>
     <a href="https://github.com/charmbracelet/soft-serve/releases"><img src="https://img.shields.io/github/release/charmbracelet/soft-serve.svg" alt="Latest Release"></a>
     <a href="https://github.com/charmbracelet/soft-serve/actions"><img src="https://github.com/charmbracelet/soft-serve/workflows/build/badge.svg" alt="Build Status"></a>
-    <a href="https://nightly.link/charmbracelet/soft-serve/workflows/build/main"><img src="https://shields.io/badge/-Nightly%20Builds-orange?logo=hackthebox&logoColor=fff&style=appveyor"/></a>
+    <a href="https://nightly.link/charmbracelet/soft-serve/workflows/nightly/main"><img src="https://shields.io/badge/-Nightly%20Builds-orange?logo=hackthebox&logoColor=fff&style=appveyor"/></a>
 </p>
 
 A tasty, self-hostable Git server for the command line. 🍦