diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41b3574..7869854 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,12 +16,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5
 
-      - name: Setup JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: oracle
-          java-version: 24
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Build
         run: |
diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
index 037d0b6..6040a56 100644
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -16,12 +16,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5
 
-      - name: Setup JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: oracle
-          java-version: 24
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Build release
         run: |
diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
index 41ade9c..734551c 100644
--- a/.github/workflows/spotless.yml
+++ b/.github/workflows/spotless.yml
@@ -20,12 +20,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5
 
-      - name: Setup JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: oracle
-          java-version: 24
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Run Spotless check
         run: |
@@ -40,12 +36,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5
 
-      - name: Setup JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: oracle
-          java-version: 24
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Run Spotless apply
         run: |
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b7dc99..4901ee9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_24_PREVIEW" project-jdk-name="openjdk-24" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_24" default="true" project-jdk-name="temurin-24" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ab6afa5..5de01a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,5 +89,6 @@ tasks.withType(JavaExec).configureEach {
 java {
 	toolchain {
 		languageVersion = JavaLanguageVersion.of(24)
+		vendor.set(JvmVendorSpec.ADOPTIUM)
 	}
 }
diff --git a/docs/dev/guide.md b/docs/dev/guide.md
index 2f049a0..a08b227 100644
--- a/docs/dev/guide.md
+++ b/docs/dev/guide.md
@@ -2,7 +2,7 @@
 
 ## 📋 Yêu cầu
 
-* **[Oracle OpenJDK 24](https://openjdk.org/projects/jdk/24/)** (Language level: 24 Preview)
+* **[Eclipse Temurin 24](https://adoptium.net/temurin/releases?version=24)**
 * **[Gradle](https://gradle.org/)**
 
 ## 🚀 Setup
diff --git a/settings.gradle b/settings.gradle
index d1d3ea0..27395d5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
+plugins {
+	id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
 rootProject.name = 'Bounceverse'
diff --git a/system/Readme.txt b/system/Readme.txt
deleted file mode 100644
index 6578c70..0000000
--- a/system/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains FXGL system data files.
\ No newline at end of file
diff --git a/system/fxgl.bundle b/system/fxgl.bundle
deleted file mode 100644
index a8ad53e..0000000
Binary files a/system/fxgl.bundle and /dev/null differ