diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0a3e594..bce9092 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,8 +10,8 @@ env:
   IMAGE_NAME: gotes3mp
 
 jobs:
-  build-linux:
-    name: Build Linux
+  build-linux-x64:
+    name: Build Linux - x64
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -29,7 +29,7 @@ jobs:
       - name: Build-Linux
         run: CGO_ENABLED=0 go build -ldflags="-X 'main.Build=${{ github.event.release.tag_name }}' -X 'main.GitCommit=$GITHUB_SHA'" -o build/goTES3MP-Linux src/*.go
       - name: Generate default config
-        run: cd build/ &&chmod +x goTES3MP-Linux && ./goTES3MP-Linux
+        run: cd build/ && chmod +x goTES3MP-Linux && ./goTES3MP-Linux
 
       - name: GH Release
         uses: softprops/action-gh-release@v0.1.15
@@ -39,7 +39,35 @@ jobs:
           files: |
             build/goTES3MP-Linux
             build/config.yaml
+  build-linux-aarch64:
+    name: Build Linux - aarch64
+    runs-on: self-hosted
+    permissions:
+      contents: write
+      discussions: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v4
+        with:
+          go-version: ^1.20
+          stable: true
+        id: linux-build
+      - name: Run Tests
+        run: go test ./src/...
+      - name: Build-Linux
+        run: CGO_ENABLED=0 go build -ldflags="-X 'main.Build=${{ github.event.release.tag_name }}' -X 'main.GitCommit=$GITHUB_SHA'" -o build/goTES3MP-Linux-aarm64 src/*.go
+      - name: Generate default config
+        run: cd build/ && chmod +x goTES3MP-Linux-aarm64 && ./goTES3MP-Linux-aarm64
 
+      - name: GH Release
+        uses: softprops/action-gh-release@v0.1.15
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: |
+            build/goTES3MP-Linux-aarm64
+            build/config.yaml
   build-windows:
     name: Build Windows
     runs-on: ubuntu-latest