diff --git a/app/build.gradle b/app/build.gradle
index 5c6cec2..4f4061d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,9 +52,9 @@ android {
         applicationId "com.idlegandalf.ledd"
         minSdkVersion 18
         targetSdkVersion 23
-        versionCode System.getenv("BUILD_NUMBER") ?: 5
+        versionCode System.getenv("BUILD_NUMBER") as Integer ?: 5
         versionName System.getenv("GIT_COMMIT") ?: "1.0.4-SNAPSHOT"
-        archivesBaseName = System.getenv("BUILD_TAG") ?: "LedD"
+        archivesBaseName = "LedD-" + versionCode + "-" + versionName
     }
     buildTypes {
         release {