diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 83d0b382d..66bf6f798 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -20,7 +20,7 @@ fun generateVersionName() = "${Config.versionMajor}.${Config.versionMinor}.${Con
 val apkPrefix get() = System.getenv("TAG") ?: "kiwix"
 
 android {
-
+  namespace = "org.kiwix.kiwixmobile"
   defaultConfig {
     base.archivesName.set(apkPrefix)
     resValue("string", "app_name", "Kiwix")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c53a47675..4f9233ff6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="org.kiwix.kiwixmobile">
+  xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission
     android:name="android.permission.ACCESS_FINE_LOCATION"
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d9b1d6f2a..b1f8af508 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:7.4.2")
+  implementation("com.android.tools.build:gradle:8.1.3")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
   implementation("org.jacoco:org.jacoco.core:0.8.8")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0")
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index a10d79df3..b5b3c3116 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -44,7 +44,7 @@ object Versions {
 
   const val android_arch_lifecycle_extensions: String = "1.1.1"
 
-  const val com_android_tools_build_gradle: String = "7.4.2"
+  const val com_android_tools_build_gradle: String = "8.1.3"
 
   const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
 
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index c32211adc..49f332ed5 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -45,6 +45,7 @@ class AllProjectConfigurer {
 
   fun configureBaseExtension(target: Project) {
     target.configureExtension<BaseExtension> {
+      namespace = ""
       setCompileSdkVersion(Config.compileSdk)
       defaultConfig {
         minSdk = Config.minSdk
@@ -115,7 +116,7 @@ class AllProjectConfigurer {
   }
 
   fun configureCommonExtension(target: Project) {
-    target.configureExtension<CommonExtension<*, *, *, *>> {
+    target.configureExtension<CommonExtension<*, *, *, *, *>> {
       lint {
         abortOnError = true
         checkAllWarnings = true
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index f1e8811ed..570061600 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="org.kiwix.kiwixmobile.core"
   android:installLocation="auto">
 
   <uses-permission
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3ba89c3ec..f1aa9a835 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Dec 19 16:13:45 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME