diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index c360de55..aab848ef 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -61,6 +61,7 @@ android {
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
+    namespace 'app.intra'
     lintOptions {
         // Ignore lint errors that we believe are safe to ignore.
         baseline file("lint-baseline.xml")
@@ -125,11 +126,12 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     // For Firebase Analytics, etc.
-    implementation 'com.google.firebase:firebase-analytics:19.0.2'  // Last version for API <19
-    implementation 'com.google.firebase:firebase-perf:20.0.4'
-    implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
-    implementation 'com.google.firebase:firebase-crashlytics-ndk:18.2.6'
-    implementation 'com.google.firebase:firebase-config:21.0.1'
+    implementation 'com.google.firebase:firebase-analytics:22.1.2'  // Last version for API <19
+    implementation 'com.google.firebase:firebase-perf:21.0.2'
+    implementation 'com.google.firebase:firebase-crashlytics:19.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics-ndk:19.2.1'
+    implementation 'com.google.firebase:firebase-config:22.0.1'
+    implementation 'com.google.firebase:firebase-core:21.1.1'
 
     // Go backend (use fileTree instead of files to prevent Android Studio sync errors)
     implementation fileTree(goBuildDir) {
diff --git a/Android/build.gradle b/Android/build.gradle
index 1c947f96..d51bf254 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -1,7 +1,7 @@
-dependencyLocking {
-    lockAllConfigurations()
-    lockMode = LockMode.STRICT
-}
+//dependencyLocking {
+//    lockAllConfigurations()
+//    lockMode = LockMode.STRICT
+//}
 
 allprojects {
     repositories {
@@ -16,17 +16,17 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:8.5.2'
 
         // For Firebase Analytics
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:perf-plugin:1.4.0'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
-    }
-    dependencyLocking {
-        lockAllConfigurations()
-        lockMode = LockMode.STRICT
+        classpath 'com.google.gms:google-services:4.4.2'
+        classpath 'com.google.firebase:perf-plugin:1.4.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
     }
+//    dependencyLocking {
+//        lockAllConfigurations()
+//        lockMode = LockMode.STRICT
+//    }
 }
 
 task clean(type: Delete) {
diff --git a/Android/gradle.properties b/Android/gradle.properties
index 70dae5be..2ba98a53 100644
--- a/Android/gradle.properties
+++ b/Android/gradle.properties
@@ -25,5 +25,9 @@ android.useAndroidX=true
 ANDROID_COMPILE_SDK_VERSION=33
 ANDROID_BUILD_TOOLS_VERSION=33.0.0
 
-ANDROID_MIN_SDK_VERSION=16
+ANDROID_MIN_SDK_VERSION=21
 ANDROID_TARGET_SDK_VERSION=33
+org.gradle.dependency.verification=off
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
index ffed3a25..48c0a02c 100644
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists