diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml
index fcc28e05f..7fcbd524f 100644
--- a/platform/android/bitrise.yml
+++ b/platform/android/bitrise.yml
@@ -200,14 +200,19 @@ workflows:
             #!/bin/bash
             echo "Compile libmapbox-gl.so for all supportd abi's:"
             export BUILDTYPE=Release
-            make apackage
+            make android-lib-arm-v5
+            make android-lib-arm-v7
+            make android-lib-arm-v8
+            make android-lib-x86
+            make android-lib-x86-64
+            cd platform/android && ./gradlew :MapboxGLAndroidSDK:assembleRelease
     - script:
         title: Publish to maven
         inputs:
         - content: |-
             #!/bin/bash
             echo "Upload aar file to maven:"
-            cd platform/android && ./gradlew uploadArchives
+            cd platform/android && ./gradlew :MapboxGLAndroidSDK:uploadArchives
     - slack:
         title: Post to Slack
         inputs:
@@ -293,7 +298,12 @@ workflows:
             #!/bin/bash
             echo "Compile libmapbox-gl.so for all supportd abi's:"
             export BUILDTYPE=Release
-            make apackage
+            make android-lib-arm-v5
+            make android-lib-arm-v7
+            make android-lib-arm-v8
+            make android-lib-x86
+            make android-lib-x86-64
+            cd platform/android && ./gradlew :MapboxGLAndroidSDK:assembleRelease
     - script:
         title: Log metrics
         inputs: