diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15330fc..bb3b613 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,11 +44,19 @@ jobs:
       uses: softprops/action-gh-release@v1
       with:
         files: |
+            dist/kalmia_${{ github.ref_name }}_freebsd_amd64
+            dist/kalmia_${{ github.ref_name }}_freebsd_arm64
+            dist/kalmia_${{ github.ref_name }}_linux_386
             dist/kalmia_${{ github.ref_name }}_linux_amd64
+            dist/kalmia_${{ github.ref_name }}_linux_arm
             dist/kalmia_${{ github.ref_name }}_linux_arm64
-            dist/kalmia_${{ github.ref_name }}_win64.exe
-            dist/kalmia_${{ github.ref_name }}_freebsd64
-            dist/kalmia_${{ github.ref_name }}_macos64
+            dist/kalmia_${{ github.ref_name }}_linux_riscv64
+            dist/kalmia_${{ github.ref_name }}_macos_amd64
+            dist/kalmia_${{ github.ref_name }}_macos_arm64
+            dist/kalmia_${{ github.ref_name }}_windows_386.exe
+            dist/kalmia_${{ github.ref_name }}_windows_amd64.exe
+            dist/kalmia_${{ github.ref_name }}_windows_arm64.exe
+
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         
diff --git a/Makefile b/Makefile
index d7bdb5e..15e95dc 100644
--- a/Makefile
+++ b/Makefile
@@ -22,26 +22,40 @@ else
 	done
 endif
 
-build-amd64-linux:
+# Linux builds
+build-linux-amd64:
 	GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_linux_amd64 main.go
-
-build-arm64-linux:
+build-linux-386:
+	GOOS=linux GOARCH=386 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_linux_386 main.go
+build-linux-arm:
+	GOOS=linux GOARCH=arm go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_linux_arm main.go
+build-linux-arm64:
 	GOOS=linux GOARCH=arm64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_linux_arm64 main.go
-
-build-win64:
-	GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_win64.exe main.go
-
-build-freebsd64:
-	GOOS=freebsd GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_freebsd64 main.go
-
+build-linux-riscv64:
+	GOOS=linux GOARCH=riscv64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_linux_riscv64 main.go
+
+# Windows builds
+build-windows-amd64:
+	GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_windows_amd64.exe main.go
+build-windows-386:
+	GOOS=windows GOARCH=386 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_windows_386.exe main.go
+build-windows-arm64:
+	GOOS=windows GOARCH=arm64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_windows_arm64.exe main.go
+
+# FreeBSD builds
+build-freebsd-amd64:
+	GOOS=freebsd GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_freebsd_amd64 main.go
+build-freebsd-arm64:
+	GOOS=freebsd GOARCH=arm64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_freebsd_arm64 main.go
+
+# macOS builds
+build-macos-amd64:
+	GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_macos_amd64 main.go
 build-macos-arm64:
 	GOOS=darwin GOARCH=arm64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_macos_arm64 main.go
 
-build-macos-amd64:
-	GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w" -o dist/$(APP_NAME)_$(APP_VERSION)_macos64 main.go
-
-build: clean build-amd64-linux build-arm64-linux build-win64 build-freebsd64 build-macos-arm64 build-macos-amd64
+build: clean build-linux-amd64 build-linux-386 build-linux-arm build-linux-arm64 build-linux-riscv64 build-windows-amd64 build-windows-386 build-windows-arm64 build-freebsd-amd64 build-freebsd-arm64 build-macos-amd64 build-macos-arm64
 	mkdir -p dist
 
 clean:
-	rm -rf dist
\ No newline at end of file
+	rm -rf dist