diff --git a/app/build.gradle b/app/build.gradle
index 6f4aaa57a77417379a15172c3dd7c7c8d8c38d32..9b0d7aa2de8b1a29f6426d7c4e6052e40d363d6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,9 @@
 import java.text.SimpleDateFormat;
 apply plugin: 'com.android.application'
 def versionMajor = 1
+def versionMinor = 0
+def versionPatch = 0
 
-def buildTime() {
-    def df = new SimpleDateFormat("yy-MM-dd'T'HHmm") // you can change it
-    df.setTimeZone(TimeZone.getTimeZone("UTC"))
-    return df.format(new Date())
-}
 
 def getTestProp(String propName) {
     def result = ""
@@ -27,10 +24,9 @@ android {
     defaultConfig {
         applicationId "foundation.e.drive"
         minSdkVersion 26
-        versionCode 1
-        //versionName "1.0"
-        versionName "beta-${versionMajor}-build-o-${buildTime()}"
-        setProperty("archivesBaseName", "$applicationId.$versionName")
+        versionCode versionMajor * 1000000 + versionMinor * 1000 + versionPatch
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+        setProperty("archivesBaseName", "eDrive-$versionName")
         buildConfigField "String", "testAccountName", "\""+getTestProp("testAccountName")+"\""
         buildConfigField "String", "testAccountPWd", "\""+getTestProp("testAccountPwd")+"\""
         buildConfigField "String", "testServerUrl", "\""+getTestProp("testServerUrl")+"\""