diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11047987ed058b825148d35cad7e336509847cd7..a43fd8bcf5b21d6444cc52bfee6f156e857bc5e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,8 @@ build:
   - echo modules.nearby false >> local.properties
   script:
   - ./gradlew hideSecretFromPropertiesFile -PpropertiesFileName=credentials.properties -Ppackage=com.google.android.gms
-  - ./gradlew assembleDebug
-  - ./gradlew assembleRelease
+  - ./gradlew assembleMapboxDefaultDebug assembleDefaultDebug
+  - ./gradlew assembleMapboxDefaultRelease assembleDefaultRelease
   artifacts:
     paths:
     - play-services-core/build/outputs/apk/
@@ -54,8 +54,8 @@ build-nearby:
   - echo modules.nearby true >> local.properties
   script:
   - ./gradlew hideSecretFromPropertiesFile -PpropertiesFileName=credentials.properties -Ppackage=com.google.android.gms
-  - ./gradlew assembleDebug
-  - ./gradlew assembleRelease
+  - ./gradlew assembleMapboxDefaultDebug assembleDefaultDebug
+  - ./gradlew assembleMapboxDefaultRelease assembleDefaultRelease
 
 publish:
   stage: publish
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 1b943ecaf84eedfaa88a8d9acf716744a05c0bd1..2b86575d58a0b2b8d45229a435bf981dfefb5d05 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -136,9 +136,14 @@ android {
         buildConfigField "String", "RECAPTCHA_ENTERPRISE_PROJECT_ID", "\"${localProperties.get("recaptchaEnterpreise.projectId", "")}\""
         buildConfigField "String", "RECAPTCHA_ENTERPRISE_SITE_KEY", "\"${localProperties.get("recaptchaEnterpreise.siteKey", "")}\""
         buildConfigField "String", "RECAPTCHA_ENTERPRISE_API_KEY", "\"${localProperties.get("recaptchaEnterpreise.apiKey", "")}\""
+    }
 
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk false
         }
     }
 
@@ -277,6 +282,12 @@ if (file('user.gradle').exists()) {
 
 android.applicationVariants.all { variant ->
     variant.outputs.each { output ->
-        output.outputFileName = variant.applicationId + "-" + variant.versionCode + variant.versionName.substring(version.length()) + ".apk"
+
+        def abi = output.getFilter(com.android.build.OutputFile.ABI)
+        if (abi == null) {
+            abi = "universal"
+        }
+
+        output.outputFileName = "${variant.applicationId}-${variant.versionCode}-${variant.versionName}-${abi}.apk"
     }
 }
diff --git a/play-services-maps/core/hms/build.gradle b/play-services-maps/core/hms/build.gradle
index 9ca2082e013f38cc4a99872409b8079fb32209cc..3abba9e83c895d6a1d1f7ce6fac99024e48189ab 100644
--- a/play-services-maps/core/hms/build.gradle
+++ b/play-services-maps/core/hms/build.gradle
@@ -25,9 +25,14 @@ android {
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
         buildConfigField "String", "HMSMAP_KEY", "\"${localProperties.getProperty("hmsmap.key", "")}\""
+    }
 
-        ndk {
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a"
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk false
         }
     }
 
diff --git a/play-services-maps/core/mapbox/build.gradle b/play-services-maps/core/mapbox/build.gradle
index 561eaf24b37eaec4b5ad7aeacea879c67a84c854..c02227eae2f6ea224dda9872a7b50a4910590e83 100644
--- a/play-services-maps/core/mapbox/build.gradle
+++ b/play-services-maps/core/mapbox/build.gradle
@@ -68,9 +68,14 @@ android {
         targetSdkVersion androidTargetSdk
         buildConfigField "String", "MAPBOX_KEY", "\"${localProperties.getProperty("mapbox.key", System.getenv('MAPBOX_VECTOR_TILES_KEY') ?: "")}\""
         buildConfigField "String", "STADIA_KEY", "\"${localProperties.getProperty("stadia.key", System.getenv('STADIA_API_KEY') ?: "")}\""
+    }
 
-        ndk {
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk false
         }
     }
 
diff --git a/play-services-maps/core/vtm/build.gradle b/play-services-maps/core/vtm/build.gradle
index ce66fa9a3513e6760446f3d36066e756e6baa129..e888550cce815fea239c6cc115351ad992d6b80d 100644
--- a/play-services-maps/core/vtm/build.gradle
+++ b/play-services-maps/core/vtm/build.gradle
@@ -52,9 +52,14 @@ android {
 
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+    }
 
-        ndk {
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk false
         }
     }