diff --git a/.github/workflows/build-emu.yml b/.github/workflows/build-emu.yml
index c5c04ef..f44a794 100644
--- a/.github/workflows/build-emu.yml
+++ b/.github/workflows/build-emu.yml
@@ -3,7 +3,7 @@ name: Build Emulator
 on:
   push:
     branches: [ "main" ]
-    paths: ["gb-emu/**", "lib/**", "vendored/**"]
+    paths: ["gb-emu/**", "lib/**", "vendored/**", "Cargo.toml"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,25 +19,53 @@ jobs:
     - uses: actions/checkout@v3
     - run: git submodule update --init --recursive
     - uses: actions-rs/toolchain@v1
+      if: ${{ matrix.os != 'macos' }}
       with:
           toolchain: nightly
           override: true
+    - uses: actions-rs/toolchain@v1
+      if: ${{ matrix.os == 'macos' }}
+      with:
+          toolchain: nightly
+          target: x86_64-apple-darwin, aarch64-apple-darwin
+          override: true
     - uses: awalsh128/cache-apt-pkgs-action@latest
       if: ${{ matrix.os == 'ubuntu' }}
       with:
         packages: libasound2-dev libudev-dev
         version: 1.0
     - uses: actions-rs/cargo@v1
+      if: ${{ matrix.os != 'macos' }}
       with:
         command: build
         args: --release
-    - uses: actions/upload-artifact@v3
-      if: ${{ matrix.os != 'windows' }}
+    - uses: actions-rs/cargo@v1
+      if: ${{ matrix.os == 'macos' }}
       with:
-        name: gb-emu-${{ matrix.os }}
+        command: build
+        args: --release --target x86_64-apple-darwin
+    - uses: actions-rs/cargo@v1
+      if: ${{ matrix.os == 'macos' }}
+      with:
+        command: build
+        args: --release --target aarch64-apple-darwin
+    - uses: actions/upload-artifact@v3
+      if: ${{ matrix.os == 'ubuntu' }}
+      with:
+        name: gb-emu-linux
         path: target/release/gb-emu
     - uses: actions/upload-artifact@v3
       if: ${{ matrix.os == 'windows' }}
       with:
-        name: gb-emu-${{ matrix.os }}
-        path: target/release/gb-emu.exe
\ No newline at end of file
+        name: gb-emu-windows
+        path: target/release/gb-emu.exe
+    - uses: actions/upload-artifact@v3
+      if: ${{ matrix.os == 'macos' }}
+      with:
+        name: gb-emu-macos-x86_64
+        path: target/x86_64-apple-darwin/release/gb-emu
+    - uses: actions/upload-artifact@v3
+      if: ${{ matrix.os == 'macos' }}
+      with:
+        name: gb-emu-macos-aarch64
+        path: target/aarch64-apple-darwin/release/gb-emu
\ No newline at end of file
diff --git a/.github/workflows/build-vst.yml b/.github/workflows/build-vst.yml
index 2666925..405a68e 100644
--- a/.github/workflows/build-vst.yml
+++ b/.github/workflows/build-vst.yml
@@ -3,7 +3,7 @@ name: Build VST
 on:
   push:
     branches: [ "main" ]
-    paths: ["gb-vst/**", "lib/**", "vendored/**"]
+    paths: ["gb-vst/**", "lib/**", "vendored/**", "Cargo.toml"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -24,9 +24,16 @@ jobs:
         url: 'https://github.com/trash80/mGB/raw/master/Releases/mGB1_3_1.gb'
         target: test-roms/
     - uses: actions-rs/toolchain@v1
+      if: ${{ matrix.os != 'macos' }}
       with:
           toolchain: nightly
           override: true
+    - uses: actions-rs/toolchain@v1
+      if: ${{ matrix.os == 'macos' }}
+      with:
+          toolchain: nightly
+          target: x86_64-apple-darwin, aarch64-apple-darwin
+          override: true
     - uses: awalsh128/cache-apt-pkgs-action@latest
       if: ${{ matrix.os == 'ubuntu' }}
       with: