diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d68d16a4..efff477e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,57 +1,54 @@
-name: Build OpenJDK 21 for Android and iOS
+name: Build OpenJDK 24
 
 on:
   push:
   pull_request:
   workflow_dispatch:
   schedule:
-    - cron: '0 2 1 */2 *'
+    - cron: "0 1 1 */2 *"
 
 jobs:
   build_android:
     strategy:
       matrix:
-        arch: [ "aarch64" ]
+        arch: ["aarch64"]
+        version: [24]
       fail-fast: false
 
-    name: "Build for Android ${{matrix.arch}}"
+    name: "Build Java ${{ matrix.version }} for Android ${{matrix.arch}}"
     runs-on: self-hosted
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Build with CI build script
-      run: echo ${{ secrets.USERPWD }} | sudo -S bash "ci_build_arch_${{matrix.arch}}.sh"
-    - name: Upload JDK build output
-      uses: actions/upload-artifact@v4
-      with:
-        name: "jdk24-${{matrix.arch}}"
-        path: jdk24*.tar.xz
-    - name: Upload JRE build output
-      uses: actions/upload-artifact@v4
-      with:
-        name: 'jre22-${{matrix.arch}}'
-        path: jre22*.tar.xz
-    - name: Upload JRE debuginfo build output
-      uses: actions/upload-artifact@v4
-      with:
-        name: "jre22-debuginfo-${{matrix.arch}}"
-        path: dizout
-        
-  pojav:
-    needs: build_android
-    runs-on: self-hosted
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Get jre22-aarch64
-      uses: actions/download-artifact@v4
-      with:
-        name: jre22-aarch64
-        path: pojav
-    - name: Repack JRE
-      run: bash "repackjre.sh" $GITHUB_WORKSPACE/pojav $GITHUB_WORKSPACE/pojav/jre21-pojav
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4
-      with:
-          name: jre22-pojav
-          path: pojav/jre22-pojav/*
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: set up JDK 24
+        uses: actions/setup-java@v4
+        with:
+          java-version: 24-ea
+          distribution: temurin
+
+      - name: Install build dependencies
+        run: |
+          echo ${{ secrets.USERPWD }} | sudo -S apt update
+          echo ${{ secrets.USERPWD }} | sudo -S apt -y install cmake autoconf python3 python-is-python3 unzip zip systemtap-sdt-dev libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxtst-dev libxt-dev
+
+      - name: Build with CI build script
+        run: export TARGET_VERSION=${{ matrix.version }} && echo ${{ secrets.USERPWD }} | sudo -S bash "1_ci_build_arch_${{matrix.arch}}.sh"
+
+      - name: Upload JDK build output
+        uses: actions/upload-artifact@v4
+        with:
+          name: "jdk${{ matrix.version }}-${{matrix.arch}}"
+          path: jdk${{ matrix.version }}*.tar.xz
+
+      - name: Upload JRE build output
+        uses: actions/upload-artifact@v4
+        with:
+          name: "jre${{ matrix.version }}-${{matrix.arch}}"
+          path: jre${{ matrix.version }}*.tar.xz
+
+      - name: Upload JRE debuginfo build output
+        uses: actions/upload-artifact@v4
+        with:
+          name: "jre${{ matrix.version }}-debuginfo-${{matrix.arch}}"
+          path: dizout