diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3290f69c5..bb26dd620 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -264,7 +264,7 @@ dependencies {
 
     implementation(libs.process.phoenix)
 
-    "huaweiImplementation"(libs.ag.coreservice)
+    "huaweiImplementation"(libs.huawei.hms.coreservice)
 
     // LeakCanary
     debugImplementation(libs.squareup.leakcanary.android)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d9f9d3137..17af96b1c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ viewpager2 = "1.1.0"
 work = "2.10.2"
 
 [libraries]
-ag-coreservice = { module = "com.huawei.hms:ag-coreservice", version.ref = "agCoreservice" }
+huawei-hms-coreservice = { module = "com.huawei.hms:ag-coreservice", version.ref = "agCoreservice" }
 airbnb-epoxy-android = { module = "com.airbnb.android:epoxy", version.ref = "epoxy" }
 airbnb-epoxy-processor = { module = "com.airbnb.android:epoxy-processor", version.ref = "epoxy" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4e37e81db..2114ffc56 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -36,7 +36,12 @@ dependencyResolutionManagement {
                 includeModule("com.github.topjohnwu.libsu", "core")
             }
         }
-        maven { url = uri("https://developer.huawei.com/repo/") }
+        // Only included in huawei variants
+        maven("https://developer.huawei.com/repo/") {
+            content {
+                includeModule("com.huawei.hms", "ag-coreservice")
+            }
+        }
     }
 }
 include(":app")