diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49d5948fd..1e4d01e29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
             os: ubuntu-latest
           - nickname: macos jdk17
             java: 17
-            os: macos-latest
+            os: macos-12
           - nickname: windows jdk17
             java: 17
             os: windows-latest
diff --git a/scripts/generate-languages.sh b/scripts/generate-languages.sh
index d541d879d..2a7dccf29 100755
--- a/scripts/generate-languages.sh
+++ b/scripts/generate-languages.sh
@@ -59,6 +59,7 @@ for VALUE in $VALUES;
     jextract --header-class-name TreeSitter$LANGUAGENAME --output $TARGETMODULEPATH/src/main/java -t org.springframework.shell.treesitter.language.$LANGUAGEID.ts $TARGETMODULEPATH/src/ts/tree-sitter-$LANGUAGEID.h
     mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Linux/x86_64
     mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64
+    mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64
     ZIGFILES=$REPOPATH/src/parser.c
     if [ -f $REPOPATH/src/scanner.c ]; then
       ZIGFILES="$ZIGFILES $REPOPATH/src/scanner.c"
@@ -67,5 +68,6 @@ for VALUE in $VALUES;
     zig cc -g0 -O2 -shared -target x86_64-windows -std=c11 -I $REPOPATH/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-$LANGUAGEID.dll $ZIGFILES
     rm $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/*.pdb
     rm $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/*.lib
+    zig cc -g0 -O2 -shared -target x86_64-macos -std=c11 -I $REPOPATH/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-$LANGUAGEID.jnilib $ZIGFILES
 done;
 
diff --git a/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-java.jnilib b/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-java.jnilib
new file mode 100755
index 000000000..c9734eab0
Binary files /dev/null and b/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-java.jnilib differ
diff --git a/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-java.dll b/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-java.dll
index 70cf3e6b9..81150184b 100755
Binary files a/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-java.dll and b/spring-shell-treesitter-language/spring-shell-treesitter-language-java/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-java.dll differ
diff --git a/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-json.jnilib b/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-json.jnilib
new file mode 100755
index 000000000..cffa8f2c7
Binary files /dev/null and b/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-json.jnilib differ
diff --git a/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-json.dll b/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-json.dll
index 4883cab9d..954f8c883 100755
Binary files a/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-json.dll and b/spring-shell-treesitter-language/spring-shell-treesitter-language-json/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-json.dll differ
diff --git a/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-yaml.jnilib b/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-yaml.jnilib
new file mode 100755
index 000000000..b73ea98b4
Binary files /dev/null and b/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter-yaml.jnilib differ
diff --git a/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-yaml.dll b/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-yaml.dll
index 8714bcb4e..6ca425fa1 100755
Binary files a/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-yaml.dll and b/spring-shell-treesitter-language/spring-shell-treesitter-language-yaml/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter-yaml.dll differ