diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 758f1979f..6ecc15ebb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        platform: [ubuntu-latest, macos-13, macos-14, windows-latest, ubuntu-24.04-arm]
 
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 30
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 90c030b40..bf07480c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,6 +43,10 @@ jobs:
             os: ubuntu-latest,
             target: linux-x86_64
           },
+          {
+            os: ubuntu-24.04-arm,
+            target: linux-arm64
+          },
           {
             os: macos-13,
             target: darwin64-x86_64
diff --git a/build.gradle b/build.gradle
index 7b745e57f..b34beafaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,11 @@ subprojects {
                         }
                     }
                 }
-                gcc(Gcc)
+                gcc(Gcc){
+					target("linux_aarch64") {
+						cppCompiler.executable = "/usr/bin/gcc"
+					}
+				}
             }
         }
     }
diff --git a/openjdk/build.gradle b/openjdk/build.gradle
index d52e38b42..a88804d85 100644
--- a/openjdk/build.gradle
+++ b/openjdk/build.gradle
@@ -22,6 +22,7 @@ description = 'Tongsuo: OpenJdk'
 enum NativeBuildInfo {
     WINDOWS_X86_64("windows", "x86_64"),
     LINUX_X86_64("linux", "x86_64"),
+    LINUX_AARCH64("linux", "aarch_64"),
     MAC_X86_64("osx", "x86_64") {
         String libDir() {
             "build.x86"