diff --git a/build_and_publish.sh b/build_and_publish.sh
index 231669a1db5..2bad5e35a51 100755
--- a/build_and_publish.sh
+++ b/build_and_publish.sh
@@ -12,4 +12,7 @@ function assert_success() {
 export RELEASE_MODE=true
 project="$1"
 
-assert_success ./gradlew clean "$project:clean" "$project:build" "$project:publishToMavenLocal" "$project:bintrayUpload"
+assert_success ./gradlew clean
+assert_success ./gradlew "$project:build"
+assert_success ./gradlew "$project:publishToMavenLocal"
+assert_success ./gradlew "$project:bintrayUpload"
diff --git a/publish.gradle b/publish.gradle
index 318207e44fe..4cb9aa43747 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -13,7 +13,11 @@ bintray {
                 if (directorySubname == "kotlinMultiplatform") {
                     it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
                 } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                    if (directorySubname.indexOf("android") != -1) {
+                        it.setPath("${project.name}-android/${project.version}/${project.name}-android-${project.version}.module")
+                    } else {
+                        it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                    }
                 }
             } else {
                 if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {