diff --git a/app/build.gradle b/app/build.gradle
index b74d955a05..b426cd6a39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -619,13 +619,16 @@ android {
     lint {
         disable 'ExtraTranslation'
     }
-    androidResources {
+
+    aaptOptions {
+        noCompress 'ja'
+        noCompress 'dat'
+        noCompress 'bin'
         noCompress 'pak'
         noCompress 'ja'
         noCompress 'dat'
         noCompress 'bin'
     }
-
 }
 
 configurations {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7836febc39..7f7ce3dc42 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 21 16:13:31 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/versions.gradle b/versions.gradle
index a2c1bd59f0..d35d6fc99c 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -45,7 +45,7 @@ versions.atsl_runner = "1.5.2"
 versions.atsl_rules = "1.5.0"
 versions.atsl_junit = "1.1.5"
 versions.espresso = "3.5.1"
-versions.android_gradle_plugin = '8.7.1'
+versions.android_gradle_plugin = "8.2.1"
 versions.kotlin = "1.9.21"
 versions.kotlin_coroutines = "1.7.3"
 versions.snakeyaml = "2.0"