diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index e89c821d80..4a106342a2 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:installLocation="auto"
-	android:versionName="2.7.0"
-	android:versionCode="270"
 	package="net.osmand.plus">
 
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 8cd09c24a3..21d0bbb9f1 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -39,10 +39,12 @@ android {
 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
 		targetSdkVersion 23
+		versionCode 270
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		multiDexEnabled true
+		versionName "2.7.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
-		//versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
+		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 	}
 
 	lintOptions {
@@ -187,9 +189,9 @@ def replaceNoTranslate(line) {
 //	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION")) {
 //		return line.replaceAll(">[^<]*<", ">" + System.getenv("APK_VERSION") + "<")
 //	}
-	if (line.contains("\"app_version_suffix\"") && System.getenv("APK_VERSION_SUFFIX")) {
-		return line.replaceAll("</", System.getenv("APK_VERSION_SUFFIX") + "</")
-	}
+//	if (line.contains("\"app_version_suffix\"") && System.getenv("APK_VERSION_SUFFIX")) {
+//		return line.replaceAll("</", System.getenv("APK_VERSION_SUFFIX") + "</")
+//	}
 	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")
 	}
diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index 8b85d67a3d..5e1fa13e2a 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name">OsmAnd~</string>
     <string name="app_name_free">OsmAndF~</string>
-    <string name="app_version_suffix"></string>
+    <!-- string name="app_version_suffix"></string -->
 
     <!-- Not translatable -->
     <string name="full_version_price">€5,99</string>
diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index 46418a36de..fc60d49b7b 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -49,13 +49,11 @@ public class Version {
 	}
 	
 	private Version(OsmandApplication ctx) {
-		// appVersion = ctx.getString(R.string.app_version);
 		String appVersion = "";
 		int versionCode = -1;
 		try {
 			PackageInfo packageInfo = ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0);
-			//appVersion = packageInfo.versionName; //already appended in build.gradle: + ctx.getString(R.string.app_version_suffix);
-			appVersion = packageInfo.versionName + ctx.getString(R.string.app_version_suffix);
+			appVersion = packageInfo.versionName;  //Version suffix  ctx.getString(R.string.app_version_suffix)  already appended in build.gradle
 			versionCode = packageInfo.versionCode;
 		} catch (PackageManager.NameNotFoundException e) {
 			e.printStackTrace();