diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32d68828..d3e604d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,27 +14,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', ['self-hosted', 'ARM64'] ]
+                os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', 'ubuntu-24.04-arm']
                 java: [ '8', '11', '17', '21' ]
 
         steps:
             - uses: actions/checkout@v4
 
-            - name: Set up JDK (x64)
+            - name: Set up JDK
               uses: actions/setup-java@v4
-              if: runner.arch != 'ARM64' && runner.os != 'Linux'
               with:
                   java-version: ${{ matrix.java }}
-                  architecture: ${{ runner.arch }}
-                  distribution: 'temurin'
-                  cache: 'gradle'
-
-            - name: Set up JDK (arm64)
-              uses: actions/setup-java@v4
-              if: runner.arch == 'ARM64' && runner.os == 'Linux'
-              with:
-                  java-version: ${{ matrix.java }}
-                  architecture: 'aarch64'
                   distribution: 'zulu'
                   cache: 'gradle'
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 701f254c..1358c3b3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
         runs-on: ${{ matrix.os }}
         strategy:
             matrix:
-                os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', ['self-hosted', 'ARM64'] ]
+                os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', 'ubuntu-24.04-arm']
                 java: [ '8', '11', '17', '21' ]
 
         steps: