diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b6f8ef..231e683 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,8 +16,12 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            name: Linux-x64
-          - os: macos-11
+            name: Linux-Wincross-x64
+          - os: ubuntu-22.04-arm
+            name: Linux-arm64            
+          - os: macos-14
+            name: MacOS-arm64
+          - os: macos-13
             name: MacOS-x64
     steps:
 
@@ -25,7 +29,7 @@ jobs:
 
       # ==== OS Specific Dependencies ====
       - name: Linux Depends
-        if: matrix.name == 'Linux-x64'
+        if: matrix.name == 'Linux-Wincross-x64'
         # For Windows crossbuild
         # Use "x64" for 64 bit (x86_64-w64-mingw32-gcc), "x86" for 32 bit (i686-w64-mingw32-gcc)
         uses: egor-tensin/setup-mingw@v2
@@ -40,7 +44,7 @@ jobs:
           submodules: false
 
       # ==== Builds ====
-      - name: Build MacOS
+      - name: Build Mac x64
         if: (matrix.name == 'MacOS-x64')
         shell: bash
         run: |
@@ -48,8 +52,24 @@ jobs:
           make macoszip
           cd ..
 
-      - name: Build Linux
-        if: (matrix.name == 'Linux-x64')
+      - name: Build Mac Arm64
+        if: (matrix.name == 'MacOS-arm64')
+        shell: bash
+        run: |
+          cd gbtoolsid-root
+          make macos_armzip
+          cd ..
+
+      - name: Build Linux Arm64
+        if: (matrix.name == 'Linux-arm64')
+        shell: bash
+        run: |
+          cd gbtoolsid-root
+          make linux_armzip
+          cd ..
+
+      - name: Build Linux + WinCross x64
+        if: (matrix.name == 'Linux-Wincross-x64')
         shell: bash
         run: |
           cd gbtoolsid-root
@@ -59,8 +79,7 @@ jobs:
           cd ..
 
       # ==== Packaging ====
-      - name: Package build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+      - name: Package build
         shell: bash
         run: |
           cd gbtoolsid-root
@@ -70,19 +89,9 @@ jobs:
           cd ..
 
       - name: Store build
-        if: (matrix.name == 'Linux-x64')
-        uses: actions/upload-artifact@v4
-        with:
-          name: gbtoolsid build Linux & Windows
-          # path: gbtoolsid-root/bin/${{ env.BUILD_PACKAGE_FILENAME }}
-          path: gbtoolsid-root/bin
-          # retention-days: 30
-
-      - name: Store build
-        if: (matrix.name == 'MacOS-x64')
         uses: actions/upload-artifact@v4
         with:
-          name: gbtoolsid build MacOS
+          name: gbtoolsid build ${{ matrix.name }}
           # path: gbtoolsid-root/bin/${{ env.BUILD_PACKAGE_FILENAME }}
           path: gbtoolsid-root/bin
           # retention-days: 30
diff --git a/Changelog.md b/Changelog.md
index c4593dd..0948f19 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+# Version 1.5.1
+- Detect GBSDK
+- Improve GBStudio detection and version numbers
+- Linux and Mac Arm64 builds
+
 # Version 1.5.0
 - Detect GBDK 4.3.0+
 - Update GBStudio 3.2.0 due to using an interim build between GBDK 4.2.0 and 4.3.0
diff --git a/Makefile b/Makefile
index f152322..c7ab202 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,11 @@ macoszip: macos
 	zip -j $(BIN)_macos.zip $(BIN) Changelog.md README.md
 	mv $(BIN)_macos.zip bin
 
+macos_armzip: macos
+	mkdir -p bin
+	# -j discards (junks) path to file
+	zip -j $(BIN)_macos_arm.zip $(BIN) Changelog.md README.md
+	mv $(BIN)_macos_arm.zip bin
 
 linuxzip: linux
 	mkdir -p bin
@@ -60,6 +65,12 @@ linuxzip: linux
 	zip -j $(BIN)_linux.zip $(BIN) Changelog.md README.md
 	mv $(BIN)_linux.zip bin
 
+linux_armzip: linux
+	mkdir -p bin
+	# -j discards (junks) path to file
+	zip -j $(BIN)_linux_arm.zip $(BIN) Changelog.md README.md
+	mv $(BIN)_linux_arm.zip bin
+
 wincrosszip: wincross
 	mkdir -p bin
 	# -j discards (junks) path to file