diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 2b6a8a9daa..10b1fd1b64 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -157,8 +157,11 @@ def replaceNoTranslate(line) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
 	}
 	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("APK_VERSION") + "<")
+	}
+	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION_SUFFIX")) {
 		// appends build number to version number for dev builds
-		return line.replaceAll("</", System.getenv("APK_VERSION") + "</")
+		return line.replaceAll("</", System.getenv("APK_VERSION_SUFFIX") + "</")
 	}
 	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")