diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eef0d20..fdc8ca8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,17 +23,6 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --release-notes=/tmp/RELEASE_NOTES
+          args: release --rm-dist --release-notes=/tmp/RELEASE_NOTES
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      - name: Build assets
-        run: |
-          mkdir -p build/{linux,windows,darwin}
-          make OS=linux  ARCH=amd64 build/vidx2pidx     && mv build/vidx2pidx     build/linux/
-          make OS=darwin ARCH=amd64 build/vidx2pidx     && mv build/vidx2pidx     build/darwin/
-          make OS=window ARCH=amd64 build/vidx2pidx.exe && mv build/vidx2pidx.exe build/windows/
-      - name: Upload assets
-        uses: actions/upload-artifact@v2
-        with:
-          name: vidx2pidx
-          path: build/*
diff --git a/.goreleaser.yml b/.goreleaser.yml
new file mode 100644
index 0000000..14b1288
--- /dev/null
+++ b/.goreleaser.yml
@@ -0,0 +1,29 @@
+project_name: vidx2pidx
+builds:
+  - env: [CGO_ENABLED=0]
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+
+archives:
+  - files:
+      - LICENSE.txt
+      - README.md
+      - CHANGELOG.md
+
+    format_overrides:
+      - goos: windows
+        format: zip
+
+    # Set to true, if you want all files in the archive to be in a single directory.
+    # If set to true and you extract the archive 'goreleaser_Linux_arm64.tar.gz',
+    # you get a folder 'goreleaser_Linux_arm64'.
+    # If set to false, all files are extracted separately.
+    # You can also set it to a custom folder name (templating is supported).
+    # Default is false.
+    wrap_in_directory: true
+
+