diff --git a/.fdroid.yml b/.fdroid.yml
index c8cc121..d92273b 100644
--- a/.fdroid.yml
+++ b/.fdroid.yml
@@ -12,9 +12,9 @@ RepoType: git
 Repo: https://github.com/andre487/AndroidMegaProxy.git
 
 Builds:
-  - versionName: 0.0.6
-    versionCode: 6
-    commit: v0.0.6
+  - versionName: 0.0.7
+    versionCode: 7
+    commit: v0.0.7
     subdir: app
     ndk: 29.0.14206865
     sudo:
@@ -23,13 +23,12 @@ Builds:
       - apt-get install -y gcc libc-dev make openjdk-21-jdk-headless
       - mkdir -p /home/runner/work/AndroidMegaProxy
       - chown -R vagrant:vagrant /home/runner
-    prebuild:
-      - sdkmanager 'platforms;android-26'
     gradle:
       - yes
     srclibs:
       - go@go1.26.3
     binary: https://github.com/andre487/AndroidMegaProxy/releases/download/v%v/mega-proxy-universal.apk
+    prebuild: sdkmanager 'platforms;android-26'
     build:
       - pushd $$go$$/src
       - ./make.bash
@@ -45,5 +44,5 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 0.0.6
-CurrentVersionCode: 6
+CurrentVersion: 0.0.7
+CurrentVersionCode: 7
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10e02c3..1cc34e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,11 +40,11 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v6
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
           cache: gradle
 
       - name: Set up Go
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5041f13..7805a5a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,11 +23,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
           cache: gradle
 
       - name: Set up Go
diff --git a/README.md b/README.md
index eb83054..ff46485 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,7 @@ For production-ready HTTPS, SSH, and SSH-with-jump server configurations, see th
 
 The command-line build does not require Android Studio. It requires:
 
-- JDK 17
+- JDK 21
 - Go 1.26 or newer
 - `gomobile`
 - Android SDK Platform 35
@@ -212,7 +212,7 @@ The command-line build does not require Android Studio. It requires:
 Example environment on macOS:
 
 ```shell
-export JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home"
+export JAVA_HOME="/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home"
 export ANDROID_HOME="$HOME/Library/Android/sdk"
 export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/29.0.14206865"
 export PATH="$JAVA_HOME/bin:$HOME/go/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$PATH"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e0a191d..720ce16 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,8 +28,8 @@ android {
         applicationId = "net.megaproxy487"
         minSdk = 26
         targetSdk = 35
-        versionCode = 6
-        versionName = "0.0.6"
+        versionCode = 7
+        versionName = "0.0.7"
         buildConfigField("String", "GIT_COMMIT_HASH", "\"$gitCommitHash\"")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -75,7 +75,12 @@ android {
     bundle { language { enableSplit = false } }
 }
 
-kotlin { jvmToolchain(17) }
+kotlin {
+    jvmToolchain(21)
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+    }
+}
 
 dependencies {
     implementation(platform("androidx.compose:compose-bom:2025.01.01"))
diff --git a/scripts/build-release-apks.sh b/scripts/build-release-apks.sh
index b921e4d..62ac699 100755
--- a/scripts/build-release-apks.sh
+++ b/scripts/build-release-apks.sh
@@ -8,7 +8,7 @@ if [[ -f "$HOME/.zshrc.extra" ]]; then
     source "$HOME/.zshrc.extra"
 fi
 
-: "${JAVA_HOME:=/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home}"
+: "${JAVA_HOME:=/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home}"
 : "${ANDROID_HOME:=$HOME/Library/Android/sdk}"
 : "${ANDROID_NDK_HOME:=$ANDROID_HOME/ndk/29.0.14206865}"
 : "${MEGAPROXY_KEYSTORE_PATH:=$HOME/AndroidApkKey}"