diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index eecf3c9..05a52ed 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,9 +14,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Test
-        env:
-          GOOS: linux
-          GOARCH: amd64
         run: |
           mkdir -p $PROJECT_PATH
           cp -a $GITHUB_WORKSPACE/* $PROJECT_PATH/
@@ -24,10 +21,7 @@ jobs:
 
           go mod vendor
           go test -race -coverprofile=coverage.txt -covermode=atomic -v -tags "static" $(go list ./... | grep -v /vendor/)
-      - name: Build amd64
-        env:
-          GOOS: linux
-          GOARCH: amd64
+      - name: Build Binaries
         run: |
 
           cd $PROJECT_PATH
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index da0781b..639f8c8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -31,9 +31,6 @@ jobs:
           version_metadata_path: ${{ github.event.inputs.version_metadata_path }}
           github_token: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
       - name: Test
-        env:
-          GOOS: linux
-          GOARCH: amd64
         run: |
           mkdir -p $PROJECT_PATH
           cp -a $GITHUB_WORKSPACE/* $PROJECT_PATH/
@@ -42,62 +39,11 @@ jobs:
           go mod vendor
           go test -v -tags "static" $(go list ./... | grep -v /vendor/)
 
-      - name: Build amd64
-        env:
-          GOOS: linux
-          GOARCH: amd64
-        run: |
-          cd $PROJECT_PATH
-          go build -ldflags "-extldflags=-static -X main.goos=linux -X main.goarch=amd64" -o scrutiny-web-linux-amd64 -tags "static netgo sqlite_omit_load_extension" webapp/backend/cmd/scrutiny/scrutiny.go
-          go build -ldflags "-extldflags=-static -X main.goos=linux -X main.goarch=amd64" -o scrutiny-collector-metrics-linux-amd64 -tags "static netgo" collector/cmd/collector-metrics/collector-metrics.go
-
-          chmod +x scrutiny-web-linux-amd64
-          chmod +x scrutiny-collector-metrics-linux-amd64
-
-      - name: Build arm
-        env:
-          GOOS: linux
-          GOARCH: arm
-        run: |
-          cd $PROJECT_PATH
-          go build -ldflags "-extldflags=-static -X main.goos=linux -X main.goarch=arm" -o scrutiny-web-linux-arm -tags "static netgo sqlite_omit_load_extension" webapp/backend/cmd/scrutiny/scrutiny.go
-          go build -ldflags "-extldflags=-static -X main.goos=linux -X main.goarch=arm" -o scrutiny-collector-metrics-linux-arm -tags "static netgo" collector/cmd/collector-metrics/collector-metrics.go
-
-          chmod +x scrutiny-web-linux-arm
-          chmod +x scrutiny-collector-metrics-linux-arm
-
-      - name: Build arm64
-        env:
-          GOOS: linux
-          GOARCH: arm64
-        run: |
-          cd $PROJECT_PATH
-          go build -ldflags "-extldflags=-static -X main.goos=linux -X main.goarch=arm64" -o scrutiny-web-linux-arm64 -tags "static netgo sqlite_omit_load_extension" webapp/backend/cmd/scrutiny/scrutiny.go
-          go build -ldflags "-extldflags=-static -X main.goos=linux -X main.goarch=arm64" -o scrutiny-collector-metrics-linux-arm64 -tags "static netgo" collector/cmd/collector-metrics/collector-metrics.go
-
-          chmod +x scrutiny-web-linux-arm64
-          chmod +x scrutiny-collector-metrics-linux-arm64
-
-      - name: Build windows
-        env:
-          GOOS: windows
-          GOARCH: amd64
+      - name: Build Binaries
         run: |
-          cd $PROJECT_PATH
-          go build -ldflags "-X main.goos=windows -X main.goarch=amd64" -o scrutiny-web-windows-amd64.exe -tags "static" webapp/backend/cmd/scrutiny/scrutiny.go
-          go build -ldflags "-X main.goos=windows -X main.goarch=amd64" -o scrutiny-collector-metrics-windows-amd64.exe -tags "static" collector/cmd/collector-metrics/collector-metrics.go
 
-      - name: Build freebsd
-        env:
-          GOOS: freebsd
-          GOARCH: amd64
-        run: |
           cd $PROJECT_PATH
-          go build -ldflags "-extldflags=-static -X main.goos=freebsd -X main.goarch=amd64" -o scrutiny-web-freebsd-amd64 -tags "static netgo sqlite_omit_load_extension" webapp/backend/cmd/scrutiny/scrutiny.go
-          go build -ldflags "-extldflags=-static -X main.goos=freebsd -X main.goarch=amd64" -o scrutiny-collector-metrics-freebsd-amd64 -tags "static netgo" collector/cmd/collector-metrics/collector-metrics.go
-
-          chmod +x scrutiny-web-freebsd-amd64
-          chmod +x scrutiny-collector-metrics-freebsd-amd64
+          make all
 
       - name: Commit
         uses: EndBug/add-and-commit@v4 # You can change this to use a specific version
@@ -131,7 +77,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.PROJECT_PATH }}/scrutiny-web-linux-amd64
+          asset_path: /build/scrutiny-web-linux-amd64
           asset_name: scrutiny-web-linux-amd64
           asset_content_type: application/octet-stream
       - name: Release Asset - Collector - linux-amd64
@@ -141,7 +87,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.PROJECT_PATH }}/scrutiny-collector-metrics-linux-amd64
+          asset_path: /build/scrutiny-collector-metrics-linux-amd64
           asset_name: scrutiny-collector-metrics-linux-amd64
           asset_content_type: application/octet-stream
 
@@ -153,7 +99,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.PROJECT_PATH }}/scrutiny-web-linux-arm64
+          asset_path: /build/scrutiny-web-linux-arm64
           asset_name: scrutiny-web-linux-arm64
           asset_content_type: application/octet-stream
       - name: Release Asset - Collector - linux-arm64
@@ -163,29 +109,71 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.PROJECT_PATH }}/scrutiny-collector-metrics-linux-arm64
+          asset_path: /build/scrutiny-collector-metrics-linux-arm64
           asset_name: scrutiny-collector-metrics-linux-arm64
           asset_content_type: application/octet-stream
 
-      - name: Release Asset - Web - linux-arm
+      - name: Release Asset - Web - linux-arm-5
+        id: upload-release-asset5
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: /build/scrutiny-web-linux-arm-5
+          asset_name: scrutiny-web-linux-arm-5
+          asset_content_type: application/octet-stream
+      - name: Release Asset - Collector - linux-arm-5
+        id: upload-release-asset6
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: /buildd/scrutiny-collector-metrics-linux-arm-5
+          asset_name: scrutiny-collector-metrics-linux-arm-5
+          asset_content_type: application/octet-stream
+
+      - name: Release Asset - Web - linux-arm-6
+        id: upload-release-asset5
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: /build/scrutiny-web-linux-arm-6
+          asset_name: scrutiny-web-linux-arm-6
+          asset_content_type: application/octet-stream
+      - name: Release Asset - Collector - linux-arm-6
+        id: upload-release-asset6
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: /buildd/scrutiny-collector-metrics-linux-arm-6
+          asset_name: scrutiny-collector-metrics-linux-arm-6
+          asset_content_type: application/octet-stream
+
+      - name: Release Asset - Web - linux-arm-7
         id: upload-release-asset5
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.PROJECT_PATH }}/scrutiny-web-linux-arm
-          asset_name: scrutiny-web-linux-arm
+          asset_path: /build/scrutiny-web-linux-arm-7
+          asset_name: scrutiny-web-linux-arm-7
           asset_content_type: application/octet-stream
-      - name: Release Asset - Collector - linux-arm
+      - name: Release Asset - Collector - linux-arm-7
         id: upload-release-asset6
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.PROJECT_PATH }}/scrutiny-collector-metrics-linux-arm
-          asset_name: scrutiny-collector-metrics-linux-arm
+          asset_path: /buildd/scrutiny-collector-metrics-linux-arm-7
+          asset_name: scrutiny-collector-metrics-linux-arm-7
           asset_content_type: application/octet-stream
 
       - name: Release Asset - Web - freebsd-amd64