diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 0d5f2a73..b483a97d 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -94,6 +94,7 @@ dependencies {
 }
 
 android {
+    namespace = "ca.gosyer.jui.android"
     defaultConfig {
         applicationId = "ca.gosyer.jui.android"
         versionCode = migrationCode
@@ -133,4 +134,4 @@ kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(Config.androidJvmTarget.majorVersion))
     }
-}
\ No newline at end of file
+}
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 78cacbfa..b65bb1bb 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="ca.gosyer.jui.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Internet -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -41,4 +41,4 @@
             android:name=".data.library.AndroidLibraryService"
             android:exported="false" />
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index a05c43d5..0f5afd96 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,5 +12,5 @@ dependencies {
     implementation(gradleKotlinDsl())
     implementation(gradleApi())
     implementation(localGroovy())
-    implementation("de.undercouch:gradle-download-task:4.1.2")
-}
\ No newline at end of file
+    implementation("de.undercouch:gradle-download-task:5.3.0")
+}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 00000000..368e0488
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,2 @@
+
+rootProject.name = "buildSrc"
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 0752dc52..b4ff9e3e 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -123,3 +123,7 @@ dependencies {
 buildkonfig {
     packageName = "ca.gosyer.jui.core.build"
 }
+
+android {
+    namespace = "ca.gosyer.jui.core"
+}
diff --git a/core/src/androidMain/AndroidManifest.xml b/core/src/androidMain/AndroidManifest.xml
index cd147468..5c3d3655 100644
--- a/core/src/androidMain/AndroidManifest.xml
+++ b/core/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.jui.core"/>
\ No newline at end of file
+<manifest/>
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 2668cd19..428a7e02 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -118,3 +118,7 @@ dependencies {
 buildkonfig {
     packageName = "ca.gosyer.jui.data.build"
 }
+
+android {
+    namespace = "ca.gosyer.jui.data"
+}
diff --git a/data/src/androidMain/AndroidManifest.xml b/data/src/androidMain/AndroidManifest.xml
index 09caee8e..5c3d3655 100644
--- a/data/src/androidMain/AndroidManifest.xml
+++ b/data/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.jui.data"/>
\ No newline at end of file
+<manifest/>
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index fde10921..b5522e00 100644
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -132,3 +132,7 @@ dependencies {
 buildkonfig {
     packageName = "ca.gosyer.jui.domain.build"
 }
+
+android {
+    namespace = "ca.gosyer.jui.domain"
+}
diff --git a/domain/src/androidMain/AndroidManifest.xml b/domain/src/androidMain/AndroidManifest.xml
index 0f0fbb74..5c3d3655 100644
--- a/domain/src/androidMain/AndroidManifest.xml
+++ b/domain/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.jui.domain"/>
\ No newline at end of file
+<manifest/>
diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts
index 665ad999..03084ac8 100644
--- a/i18n/build.gradle.kts
+++ b/i18n/build.gradle.kts
@@ -59,6 +59,7 @@ multiplatformResources {
 }
 
 android {
+    namespace = "ca.gosyer.jui.i18n"
     lint {
         disable += "MissingTranslation"
     }
@@ -67,4 +68,4 @@ android {
         assets.srcDir(File(buildDir, "generated/moko/androidMain/assets"))
         res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
     }
-}
\ No newline at end of file
+}
diff --git a/i18n/src/androidMain/AndroidManifest.xml b/i18n/src/androidMain/AndroidManifest.xml
index a010bf2e..5c3d3655 100644
--- a/i18n/src/androidMain/AndroidManifest.xml
+++ b/i18n/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.jui.i18n"/>
\ No newline at end of file
+<manifest/>
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
index 8c1cc3f0..6f63aab1 100644
--- a/presentation/build.gradle.kts
+++ b/presentation/build.gradle.kts
@@ -150,3 +150,7 @@ dependencies {
 buildkonfig {
     packageName = "ca.gosyer.jui.presentation.build"
 }
+
+android {
+    namespace = "ca.gosyer.jui.presentation"
+}
diff --git a/presentation/src/androidMain/AndroidManifest.xml b/presentation/src/androidMain/AndroidManifest.xml
index 88eb4a96..5c3d3655 100644
--- a/presentation/src/androidMain/AndroidManifest.xml
+++ b/presentation/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.jui.presentation"/>
\ No newline at end of file
+<manifest/>
diff --git a/ui-core/build.gradle.kts b/ui-core/build.gradle.kts
index 911f5c3a..757fd32d 100644
--- a/ui-core/build.gradle.kts
+++ b/ui-core/build.gradle.kts
@@ -116,3 +116,7 @@ kotlin {
 buildkonfig {
     packageName = "ca.gosyer.jui.uicore.build"
 }
+
+android {
+    namespace = "ca.gosyer.jui.uicore"
+}
diff --git a/ui-core/src/androidMain/AndroidManifest.xml b/ui-core/src/androidMain/AndroidManifest.xml
index 87d63ff6..5c3d3655 100644
--- a/ui-core/src/androidMain/AndroidManifest.xml
+++ b/ui-core/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.jui.uicore"/>
\ No newline at end of file
+<manifest/>