diff --git a/flutter-hms-account/android/build.gradle b/flutter-hms-account/android/build.gradle
index fb162693..8dd81973 100644
--- a/flutter-hms-account/android/build.gradle
+++ b/flutter-hms-account/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.account'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-ads/android/build.gradle b/flutter-hms-ads/android/build.gradle
index e1efbfef..77f2602b 100644
--- a/flutter-hms-ads/android/build.gradle
+++ b/flutter-hms-ads/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.ads'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
@@ -48,4 +53,4 @@ dependencies {
     implementation 'com.huawei.hms:ads-installreferrer:3.4.62.300'
     implementation 'com.huawei.hms:stats:6.12.0.300'
     implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
-}
\ No newline at end of file
+}
diff --git a/flutter-hms-adsprime/android/build.gradle b/flutter-hms-adsprime/android/build.gradle
index 3d7051d5..a45af5f9 100644
--- a/flutter-hms-adsprime/android/build.gradle
+++ b/flutter-hms-adsprime/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.ads'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-analytics/android/build.gradle b/flutter-hms-analytics/android/build.gradle
index 39c9e610..b3b3da32 100644
--- a/flutter-hms-analytics/android/build.gradle
+++ b/flutter-hms-analytics/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.analytics'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-ar/android/build.gradle b/flutter-hms-ar/android/build.gradle
index d9bc88ea..12cde8df 100644
--- a/flutter-hms-ar/android/build.gradle
+++ b/flutter-hms-ar/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.ar'
+    }
+
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 30
diff --git a/flutter-hms-availability/android/build.gradle b/flutter-hms-availability/android/build.gradle
index 2e9963ee..6286c71c 100644
--- a/flutter-hms-availability/android/build.gradle
+++ b/flutter-hms-availability/android/build.gradle
@@ -26,7 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
-    
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.hmsavailability'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-awareness/android/build.gradle b/flutter-hms-awareness/android/build.gradle
index d2a15639..e87dfbc5 100644
--- a/flutter-hms-awareness/android/build.gradle
+++ b/flutter-hms-awareness/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.awareness'
+    }
+
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 33
diff --git a/flutter-hms-contact-shield/android/build.gradle b/flutter-hms-contact-shield/android/build.gradle
index 11631029..1ae4d2bf 100644
--- a/flutter-hms-contact-shield/android/build.gradle
+++ b/flutter-hms-contact-shield/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion '30.0.3'
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.contactshield'
+    }
+
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 30
diff --git a/flutter-hms-drive/android/build.gradle b/flutter-hms-drive/android/build.gradle
index 05b8485d..7d1de580 100644
--- a/flutter-hms-drive/android/build.gradle
+++ b/flutter-hms-drive/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.drive'
+    }
+
     defaultConfig {
         minSdkVersion 27
         targetSdkVersion 30
diff --git a/flutter-hms-dtm/android/build.gradle b/flutter-hms-dtm/android/build.gradle
index dea1e989..45b26a62 100644
--- a/flutter-hms-dtm/android/build.gradle
+++ b/flutter-hms-dtm/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion '30.0.3'
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.dtm'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
diff --git a/flutter-hms-fido/android/build.gradle b/flutter-hms-fido/android/build.gradle
index d732dba8..bd704554 100644
--- a/flutter-hms-fido/android/build.gradle
+++ b/flutter-hms-fido/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.fido'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
diff --git a/flutter-hms-gameservice/android/build.gradle b/flutter-hms-gameservice/android/build.gradle
index a54be87c..87a14db4 100644
--- a/flutter-hms-gameservice/android/build.gradle
+++ b/flutter-hms-gameservice/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.huawei_gameservice'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
diff --git a/flutter-hms-health/android/build.gradle b/flutter-hms-health/android/build.gradle
index 616047ea..56a4cc4f 100644
--- a/flutter-hms-health/android/build.gradle
+++ b/flutter-hms-health/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.health'
+    }
+
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
diff --git a/flutter-hms-iap/android/build.gradle b/flutter-hms-iap/android/build.gradle
index b02ba9b5..ebd9c235 100644
--- a/flutter-hms-iap/android/build.gradle
+++ b/flutter-hms-iap/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.iap'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-location/android/build.gradle b/flutter-hms-location/android/build.gradle
index c24238f2..3201270c 100644
--- a/flutter-hms-location/android/build.gradle
+++ b/flutter-hms-location/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.location'
+    }
+
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
diff --git a/flutter-hms-map/android/build.gradle b/flutter-hms-map/android/build.gradle
index c4bcdfbe..91ca74ac 100644
--- a/flutter-hms-map/android/build.gradle
+++ b/flutter-hms-map/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.map'
+    }
+
     defaultConfig {
         minSdkVersion 20
         targetSdkVersion 33
diff --git a/flutter-hms-ml/android/build.gradle b/flutter-hms-ml/android/build.gradle
index 9bdbd13c..fc741acc 100644
--- a/flutter-hms-ml/android/build.gradle
+++ b/flutter-hms-ml/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.ml'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
diff --git a/flutter-hms-mlbody/android/build.gradle b/flutter-hms-mlbody/android/build.gradle
index f3d45808..8cd00251 100644
--- a/flutter-hms-mlbody/android/build.gradle
+++ b/flutter-hms-mlbody/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 31
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.mlbody'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 31
diff --git a/flutter-hms-mlimage/android/build.gradle b/flutter-hms-mlimage/android/build.gradle
index 1f91f146..03179552 100644
--- a/flutter-hms-mlimage/android/build.gradle
+++ b/flutter-hms-mlimage/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 31
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.mlimage'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 31
diff --git a/flutter-hms-mllanguage/android/build.gradle b/flutter-hms-mllanguage/android/build.gradle
index 43555b57..86206353 100644
--- a/flutter-hms-mllanguage/android/build.gradle
+++ b/flutter-hms-mllanguage/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.mllanguage'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-mltext/android/build.gradle b/flutter-hms-mltext/android/build.gradle
index e9efc0d8..c613fb5a 100644
--- a/flutter-hms-mltext/android/build.gradle
+++ b/flutter-hms-mltext/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 31
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.mltext'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 31
diff --git a/flutter-hms-modeling/android/build.gradle b/flutter-hms-modeling/android/build.gradle
index f390fc86..73b60bc2 100644
--- a/flutter-hms-modeling/android/build.gradle
+++ b/flutter-hms-modeling/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.modeling3d'
+    }
+
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 30
diff --git a/flutter-hms-nearbyservice/android/build.gradle b/flutter-hms-nearbyservice/android/build.gradle
index 02389d00..b0cfb1ce 100644
--- a/flutter-hms-nearbyservice/android/build.gradle
+++ b/flutter-hms-nearbyservice/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.nearbyservice'
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/flutter-hms-push/android/build.gradle b/flutter-hms-push/android/build.gradle
index 2bc03c80..9b85dfaf 100644
--- a/flutter-hms-push/android/build.gradle
+++ b/flutter-hms-push/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion '31.0.0'
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.push'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-pushfcm/android/build.gradle b/flutter-hms-pushfcm/android/build.gradle
index b64bd34b..ea241d0e 100644
--- a/flutter-hms-pushfcm/android/build.gradle
+++ b/flutter-hms-pushfcm/android/build.gradle
@@ -26,6 +26,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.pushfcm'
+    }
+
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 30
@@ -42,4 +47,4 @@ android {
 
 dependencies {
     implementation 'com.huawei.hms:push-fcm:6.3.0.304'
-}
\ No newline at end of file
+}
diff --git a/flutter-hms-safetydetect/android/build.gradle b/flutter-hms-safetydetect/android/build.gradle
index 5c1fecdb..d2a9d738 100644
--- a/flutter-hms-safetydetect/android/build.gradle
+++ b/flutter-hms-safetydetect/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.safetydetect'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
diff --git a/flutter-hms-scan/android/build.gradle b/flutter-hms-scan/android/build.gradle
index f8498c46..4885f7e0 100644
--- a/flutter-hms-scan/android/build.gradle
+++ b/flutter-hms-scan/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.scan'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-site/android/build.gradle b/flutter-hms-site/android/build.gradle
index 0decb6e5..80cd731c 100644
--- a/flutter-hms-site/android/build.gradle
+++ b/flutter-hms-site/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 33
     buildToolsVersion "31.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.site'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
diff --git a/flutter-hms-wallet/android/build.gradle b/flutter-hms-wallet/android/build.gradle
index 0be5170b..b51a18a5 100644
--- a/flutter-hms-wallet/android/build.gradle
+++ b/flutter-hms-wallet/android/build.gradle
@@ -27,6 +27,10 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.wallet'
+    }
+
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30