diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 53fe414..382fd18 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [17]
+        java: [17, 21]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
diff --git a/app/build.gradle b/app/build.gradle
index e6a0511..5cd672f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,12 +7,12 @@ jacoco {
 
 android {
     namespace 'ai.elimu.kukariri'
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "ai.elimu.kukariri"
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 35
         versionCode 1000005
         versionName "1.0.5-SNAPSHOT"
         setProperty("archivesBaseName", "${applicationId}-${versionCode}")
diff --git a/build.gradle b/build.gradle
index 88310c9..e4c3174 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath 'com.mxalbert.gradle:jacoco-android:0.2.1'
         
         // NOTE: Do not place your application dependencies here; they belong