diff --git a/app/build.gradle b/app/build.gradle
index b814da82..5e6b1b58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,6 +40,22 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def outputFile = output.outputFile
+            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                if (variant.buildType.name == 'release') {
+                    def fileName = "${defaultConfig.applicationId}_${defaultConfig.versionName}_release.apk"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                } else {
+                    def fileName = "${defaultConfig.applicationId}_${defaultConfig.versionName}_debug.apk"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/devlin.jks b/devlin.jks
index d26ea590..cb55f28f 100644
Binary files a/devlin.jks and b/devlin.jks differ
diff --git a/gradle.properties b/gradle.properties
index 21309a2f..396c58f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,6 @@
 systemProp.http.proxyHost=127.0.0.1
 org.gradle.jvmargs=-Xmx1536m
 systemProp.http.proxyPort=1080
-KEY_PWD=6572263
+KEY_PWD=123456
 KEY_ALIAS=devlin
-KEYSTORE_PWD=6572263
+KEYSTORE_PWD=123456