diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index 01b72aa00..19d1d2696 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '17'
           cache: 'gradle'
 
       - name: Change wrapper permissions
@@ -60,7 +60,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '17'
           cache: 'gradle'
 
       - name: Change wrapper permissions
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index fa3d2f03e..1112545d6 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         versionName = "1.0-SNAPSHOT"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 12e7504e4..0d8d1e94f 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
 
 kotlin {
     android()
-    jvm("desktop") {
-        jvmToolchain(11)
-    }
+
+    jvm("desktop")
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -52,8 +52,8 @@ android {
         targetSdk = (findProperty("android.targetSdk") as String).toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     namespace = "org.hisp.dhis.common"
 }
diff --git a/gradle.properties b/gradle.properties
index c175cfd67..dc2191b96 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,5 @@ android.minSdk=24
 
 #Versions
 kotlin.version=1.8.20
-agp.version=7.4.2
+agp.version=8.0.0
 compose.version=1.4.3
\ No newline at end of file