diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 1f870da5e..cd455fa0b 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -65,6 +65,11 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       
       - name: Cache node modules
         uses: actions/cache@v3
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index d84418d85..4b982c9f9 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -20,6 +20,11 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      
       - name: Ensure source code revision
         run: scripts/ensure-code-revision.sh        
         working-directory: platform/android
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 3b190e3fc..3107bea50 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath dependenciesList.licensesPlugin
         classpath dependenciesList.kotlinPlugin
         // classpath dependenciesList.jacocoPlugin
diff --git a/platform/android/gradle.properties b/platform/android/gradle.properties
index 2960c164e..d33f742c3 100644
--- a/platform/android/gradle.properties
+++ b/platform/android/gradle.properties
@@ -1,4 +1,7 @@
 android.useAndroidX=true
 systemProp.org.gradle.internal.http.connectionTimeout=360000
 systemProp.org.gradle.internal.http.socketTimeout=360000
-org.gradle.jvmargs=-Xmx4096M
\ No newline at end of file
+org.gradle.jvmargs=-Xmx4096M
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/platform/android/gradle/gradle-lint.gradle b/platform/android/gradle/gradle-lint.gradle
index cbebeaa74..8a60a79b4 100644
--- a/platform/android/gradle/gradle-lint.gradle
+++ b/platform/android/gradle/gradle-lint.gradle
@@ -19,12 +19,4 @@ def isLocalBuild() {
         return System.getenv('IS_LOCAL_DEVELOPMENT').toBoolean()
     }
     return true
-}
-
-lint.dependsOn ciLint
-
-tasks.whenTaskAdded { task ->
-    if (task.name == 'lintVitalRelease') {
-        task.dependsOn ciLint
-    }
 }
\ No newline at end of file
diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties
index 62f4c40d8..328d2a3ae 100644
--- a/platform/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Dec 15 15:24:50 PST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME