diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index db44ea235..4c0498c5e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -78,11 +78,11 @@ android {
 }
 
 play {
-  isEnabled = true
-  serviceAccountCredentials = file("../google.json")
-  track = "alpha"
-  releaseStatus = "draft"
-  resolutionStrategy = "fail"
+  //isEnabled = true
+  //serviceAccountCredentials = file("../google.json")
+  //track = "alpha"
+ // releaseStatus = "draft"
+  //resolutionStrategy = "fail"
 }
 
 dependencies {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e5b5f1582..b879a8093 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:4.0.1")
+  implementation("com.android.tools.build:gradle:4.2.0")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
   implementation("com.hiya:jacoco-android:0.2")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 93041465c..5509355d1 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -42,11 +42,11 @@ object Versions {
 
   const val android_arch_lifecycle_extensions: String = "1.1.1"
 
-  const val com_android_tools_build_gradle: String = "4.0.1" // available: "4.1.1"
+  const val com_android_tools_build_gradle: String = "4.2.0" // available: "4.1.1"
 
   const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
 
-  const val com_github_triplet_play_gradle_plugin: String = "2.8.0" // available: "3.0.0"
+  const val com_github_triplet_play_gradle_plugin: String = "3.5.0" // available: "3.0.0"
 
   const val javax_annotation_api: String = "1.3.2"
 
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 2cdedc4f3..302b93e56 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -75,19 +75,19 @@ class AllProjectConfigurer {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
         unitTests.apply {
           isReturnDefaultValues = true
-          all(KotlinClosure1<Any, Test>({
-            (this as Test).also { testTask ->
-              testTask.useJUnitPlatform()
-              testTask.testLogging {
-                setEvents(setOf("passed", "skipped", "failed", "standardOut", "standardError"))
-                outputs.upToDateWhen { false }
-                showStandardStreams = true
-              }
-              testTask.extensions
-                .getByType(JacocoTaskExtension::class.java)
-                .isIncludeNoLocationClasses = true
-            }
-          }, this))
+          // all(KotlinClosure1<Any, Test>({
+          //   (this as Test).also { testTask ->
+          //     testTask.useJUnitPlatform()
+          //     testTask.testLogging {
+          //       setEvents(setOf("passed", "skipped", "failed", "standardOut", "standardError"))
+          //       outputs.upToDateWhen { false }
+          //       showStandardStreams = true
+          //     }
+          //     testTask.extensions
+          //       .getByType(JacocoTaskExtension::class.java)
+          //       .isIncludeNoLocationClasses = true
+          //   }
+          // }, this))
         }
       }
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/NetworkModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/NetworkModule.kt
index 0c64a1715..8f9754a92 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/NetworkModule.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/NetworkModule.kt
@@ -33,7 +33,7 @@ import javax.inject.Singleton
 private const val CONNECTION_TIMEOUT = 10L
 private const val READ_TIMEOUT = 60L
 private const val CALL_TIMEOUT = 60L
-private const val USER_AGENT = "kiwix-android-version:${BuildConfig.VERSION_CODE}"
+private const val USER_AGENT = "kiwix-android-version:1"
 private const val KIWIX_DOWNLOAD_URL = "https://mirror.download.kiwix.org/"
 
 @Module
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9ec52ade7..edc0bb5b5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip