diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 06c7d7d44..574bb52d6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -75,9 +75,6 @@ jobs:
         - { os: windows-11-arm, ruby: '3.1' }
         - { os: windows-11-arm, ruby: '3.2' }
         - { os: windows-11-arm, ruby: '3.3' }
-        # https://github.com/ruby/jruby-dev-builder/pull/14#issuecomment-2829841247
-        - { os: windows-11-arm, ruby: jruby }
-        - { os: windows-11-arm, ruby: jruby-head }
         # RubyInstaller has no 64-bit builds of 1.9 on Windows
         - { os: windows-2022, ruby: '1.9' }
         - { os: windows-2025, ruby: '1.9' }
diff --git a/common.js b/common.js
index 72e2a9ceb..247d99eed 100644
--- a/common.js
+++ b/common.js
@@ -395,10 +395,15 @@ export async function setupJavaHome(rubyPrefix) {
       console.log("JRuby failed to start, try Java 21 envs")
 
       let arch = os.arch()
-      if (arch === "x64" || os.platform() !== "darwin") {
+      if (arch === "arm64" && os.platform() === "win32") {
+        arch = "AARCH64"
+      } else if (arch === "x64" || os.platform() !== "darwin") {
         arch = "X64"
       }
 
+      // JAVA_HOME_21_AARCH64 - https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md#java
+      // JAVA_HOME_21_arm64 - https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#java
+      // JAVA_HOME_21_X64 - https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#java
       let newHomeVar = `JAVA_HOME_21_${arch}`
       let newHome = process.env[newHomeVar]
 
diff --git a/dist/index.js b/dist/index.js
index 54dac9fe9..a86b6b235 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -713,10 +713,15 @@ async function setupJavaHome(rubyPrefix) {
       console.log("JRuby failed to start, try Java 21 envs")
 
       let arch = os.arch()
-      if (arch === "x64" || os.platform() !== "darwin") {
+      if (arch === "arm64" && os.platform() === "win32") {
+        arch = "AARCH64"
+      } else if (arch === "x64" || os.platform() !== "darwin") {
         arch = "X64"
       }
 
+      // JAVA_HOME_21_AARCH64 - https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md#java
+      // JAVA_HOME_21_arm64 - https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#java
+      // JAVA_HOME_21_X64 - https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#java
       let newHomeVar = `JAVA_HOME_21_${arch}`
       let newHome = process.env[newHomeVar]