diff --git a/.github/workflows/goreleaser-action.yml b/.github/workflows/goreleaser-action.yml
index 8b39306..fa11f6a 100644
--- a/.github/workflows/goreleaser-action.yml
+++ b/.github/workflows/goreleaser-action.yml
@@ -21,10 +21,10 @@ jobs:
         uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies
-        run: bun install --no-save --cwd ./hub/site
+        run: bun install --no-save --cwd ./beszel/site
 
       - name: Build site
-        run: bun run --cwd ./hub/site build
+        run: bun run --cwd ./beszel/site build
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -34,17 +34,7 @@ jobs:
       - name: GoReleaser beszel
         uses: goreleaser/goreleaser-action@v6
         with:
-          workdir: ./hub
-          distribution: goreleaser
-          version: latest
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-
-      - name: GoReleaser beszel-agent
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          workdir: ./agent
+          workdir: ./beszel
           distribution: goreleaser
           version: latest
           args: release --clean
diff --git a/beszel/.goreleaser.yml b/beszel/.goreleaser.yml
index bf0cb67..8b70be7 100644
--- a/beszel/.goreleaser.yml
+++ b/beszel/.goreleaser.yml
@@ -1,4 +1,4 @@
-# version: 1
+version: 2
 
 project_name: beszel
 
@@ -7,7 +7,10 @@ before:
     - go mod tidy
 
 builds:
-  - env:
+  - id: beszel
+    binary: beszel
+    main: cmd/hub/hub.go
+    env:
       - CGO_ENABLED=0
     goos:
       - linux
@@ -16,9 +19,11 @@ builds:
       - amd64
       - arm64
       - arm
-    main: cmd/hub/hub.go
 
-  - env:
+  - id: beszel-agent
+    binary: beszel-agent
+    main: cmd/agent/agent.go
+    env:
       - CGO_ENABLED=0
     goos:
       - linux
@@ -32,12 +37,22 @@ builds:
     ignore:
       - goos: freebsd
         goarch: arm
-    main: cmd/agent/agent.go
 
 archives:
-  - format: tar.gz
+  - id: beszel
+    format: tar.gz
+    builds:
+      - beszel-agent
     name_template: >-
-      {{ .ProjectName }}_
+      {{ .Binary }}_
+      {{- .Os }}_
+      {{- .Arch }}
+  - id: beszel-agent
+    format: tar.gz
+    builds:
+      - beszel
+    name_template: >-
+      {{ .Binary }}_
       {{- .Os }}_
       {{- .Arch }}
     # use zip for windows archives