diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
new file mode 100644
index 0000000..52d0879
--- /dev/null
+++ b/.github/workflows/mac.yml
@@ -0,0 +1,90 @@
+name: 🍎 macOS Builds
+on:
+  workflow_call:
+
+# Global Settings
+env:
+  # Used for the cache key. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: master
+  SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
+
+concurrency:
+  group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos
+  cancel-in-progress: true
+
+jobs:
+  build-macos:
+    runs-on: "macos-latest"
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Editor (target=editor, tests=yes)
+            cache-name: macos-editor
+            target: editor
+            tests: true
+            bin: "./bin/godot.macos.editor.x86_64"
+
+          - name: Template (target=template_release)
+            cache-name: macos-template
+            target: template_release
+            tests: false
+            sconsflags: debug_symbols=no
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: godotengine/godot
+
+      - uses: actions/checkout@v4
+        with:
+          path: modules/rwkv
+
+        # init submodules in the rwkv module
+      - name: Init submodules
+        run: |
+          cd modules/rwkv
+          git submodule update --init --recursive
+          cd ../..
+
+
+
+      - name: Setup Godot build cache
+        uses: ./.github/actions/godot-cache
+        with:
+          cache-name: ${{ matrix.cache-name }}
+        continue-on-error: true
+
+      - name: Setup python and scons
+        uses: ./.github/actions/godot-deps
+
+      - name: Setup Vulkan SDK
+        run: |
+          sh misc/scripts/install_vulkan_sdk_macos.sh
+
+      - name: Compilation
+        uses: ./.github/actions/godot-build
+        with:
+          sconsflags: ${{ env.SCONSFLAGS }}
+          platform: macos
+          target: ${{ matrix.target }}
+          tests: ${{ matrix.tests }}
+
+      - name: Prepare artifact
+        run: |
+          strip bin/godot.*
+          chmod +x bin/godot.*
+
+      - name: Upload artifact
+        uses: ./.github/actions/upload-artifact
+        with:
+          name: ${{ matrix.cache-name }}
+
+      # Execute unit tests for the editor
+      - name: Unit tests
+        if: ${{ matrix.tests }}
+        run: |
+          ${{ matrix.bin }} --version
+          ${{ matrix.bin }} --help
+          ${{ matrix.bin }} --test --force-colors
\ No newline at end of file
diff --git a/SCsub b/SCsub
index 3d18a61..63dea55 100644
--- a/SCsub
+++ b/SCsub
@@ -28,7 +28,7 @@ if(env["PLATFORM"] != "win32"):
         # add -O3
         env_rwkv.Append(CCFLAGS=['-O3'])
         # add -march=avx512
-        env_rwkv.Append(CCFLAGS=['-march=avx512'])
+        env_rwkv.Append(CCFLAGS=['-march=core-avx2'])
         
         # add fast math
         env_rwkv.Append(CCFLAGS=['-ffast-math'])
diff --git a/rwkv.cuh b/rwkv.cuh
index c362dbd..2c1abc1 160000
--- a/rwkv.cuh
+++ b/rwkv.cuh
@@ -1 +1 @@
-Subproject commit c362dbd78b2e876db6717eb9447e907af8aace0e
+Subproject commit 2c1abc105951c922a7dd3ed1167ba259039fa5ce