diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 2db548a71b..9faf1b38aa 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -225,10 +225,11 @@ android {
 			signingConfig signingConfigs.development
 		}
 		release {
-			productFlavors.all { flavor ->
-				flavor.signingConfig signingConfigs.publishing
+			if (gradle.startParameter.taskNames.toString().contains("huawei")) {
+				signingConfig signingConfigs.publishingHuawei
+			} else {
+				signingConfig signingConfigs.publishing
 			}
-			productFlavors.freehuawei.signingConfig signingConfigs.publishingHuawei
 		}
 	}