diff --git a/examples/android/CHIPTool/app/build.gradle b/examples/android/CHIPTool/app/build.gradle
index 368930259ea66a..4502b7f7a18897 100644
--- a/examples/android/CHIPTool/app/build.gradle
+++ b/examples/android/CHIPTool/app/build.gradle
@@ -43,9 +43,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    packagingOptions {
-        exclude 'META-INF/main.kotlin_module'
-    }
 
     buildFeatures {
         viewBinding = true
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index e22c50cd023788..ec522e367c60f4 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -262,7 +262,11 @@ kotlin_library("tlv") {
     "src/matter/tlv/values.kt",
   ]
 
-  kotlinc_flags = [ "-Xlint:deprecation" ]
+  kotlinc_flags = [
+    "-Xlint:deprecation",
+    "-module-name",
+    "com.matter.tlv",
+  ]
 }
 
 kotlin_library("tlv_reader_test") {
@@ -323,7 +327,11 @@ kotlin_library("jsontlv") {
     "src/matter/jsontlv/types.kt",
   ]
 
-  kotlinc_flags = [ "-Xlint:deprecation" ]
+  kotlinc_flags = [
+    "-Xlint:deprecation",
+    "-module-name",
+    "com.matter.matterjson",
+  ]
 }
 
 kotlin_library("json_to_tlv_to_json_test") {
@@ -363,6 +371,10 @@ kotlin_library("onboarding_payload") {
     "src/matter/onboardingpayload/Verhoeff.kt",
     "src/matter/onboardingpayload/Verhoeff10.kt",
   ]
+  kotlinc_flags = [
+    "-module-name",
+    "com.matter.onboarding",
+  ]
 }
 
 kotlin_library("onboardingpayload_manual_code_test") {
@@ -404,7 +416,11 @@ kotlin_library("chipcluster") {
   sources = structs_sources
   sources += eventstructs_sources
 
-  kotlinc_flags = [ "-Xlint:deprecation" ]
+  kotlinc_flags = [
+    "-Xlint:deprecation",
+    "-module-name",
+    "com.matter.chipcluster",
+  ]
 }
 
 kotlin_library("chipcluster_test") {