diff --git a/app/build.gradle b/app/build.gradle
index c192ca4..400b80b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 
-if (keystorePropertiesFile.exists() ) {
+if (keystorePropertiesFile.exists()) {
     // Load keystore properties from file
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 } else {
@@ -13,7 +13,7 @@
     if (env['ANDROID_KEYPASSWORD']) keystoreProperties.put('keyPassword', env['ANDROID_KEYPASSWORD'])
     else keystoreProperties.put('keyPassword', "dappre")
     if (env['ANDROID_STOREFILE']) keystoreProperties.put('storeFile', env['ANDROID_STOREFILE'])
-    else keystoreProperties.put('storeFile', "./certificate/dappre.jks")
+    else keystoreProperties.put('storeFile', ".")
     if (env['ANDROID_STOREPASSWORD']) keystoreProperties.put('storePassword', env['ANDROID_STOREPASSWORD'])
     else keystoreProperties.put('storePassword', "dappre")
 }
@@ -29,8 +29,10 @@
             storePassword keystoreProperties['storePassword']
         }
     }
+
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
+
     defaultConfig {
         applicationId "nl.digital_me.dummyandroidapp"
         minSdkVersion 14
@@ -39,39 +41,68 @@
         versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5"
         multiDexEnabled true
     }
+
     dexOptions {
         maxProcessCount 1
         threadCount 4
         javaMaxHeapSize "2048m"
         preDexLibraries false
     }
+
     buildTypes {
         release {
             signingConfig signingConfigs.release
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-fresco.pro', 'proguard-rules.pro'
             debuggable false
         }
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-fresco.pro', 'proguard-rules.pro'
+            debuggable true
+        }
     }
-    productFlavors {
-    }
-    applicationVariants.all {
-        variant ->
+
+    flavorDimensions "env"
+    
+        productFlavors {
+            acc {
+                dimension "env"
+                applicationIdSuffix ".accept"
+                versionNameSuffix "-accept"
+            }
+    
+            prd {
+                dimension "env"
+                applicationIdSuffix ""
+                versionNameSuffix ""
+            }
+        }
+    
+        applicationVariants.all { variant ->
             if (variant.buildType.name == "release") {
-                variant.outputs.each {
-                    output ->
-                        if (variant.getBuildType().isMinifyEnabled()) {
-                            variant.assemble.doLast {
-                                copy {
-                                    from variant.mappingFile
-                                    into output.outputFile.parent
-                                }
+                variant.outputs.each { output ->
+                    // Avoid to rename, so Fastlane default will work for now
+                    //output.outputFile = new File(output.outputFile.parent, output.outputFile.name.replace("app-release.apk", "dappre_${versionName}.${versionCode}.apk"))
+    
+                    if (variant.getBuildType().isMinifyEnabled()) {
+                        variant.assemble.doLast {
+                            copy {
+                                from variant.mappingFile
+                                into output.outputFile.parent
+                                // Avoid to rename, so Fastlane default will work for now
+                                //rename {
+                                //    String fileName ->
+                                //        "mapping_${versionName}.${versionCode}.txt"
+                                //}
                             }
                         }
+                    }
                 }
-           }
+            }
+        }
     }
-}
 
 dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 631b71f..b0742db 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -29,6 +29,7 @@
   lane :build do
     gradle(
       task: "clean assemble",
+      flavor: "prd",
       build_type: 'Release'
     )
   end
@@ -113,7 +114,7 @@
   desc "Deploy a new version to the Google Play"
   lane :alpha do
     supply(
-      apk: 'app/build/outputs/apk/release/app-release.apk',
+      apk: 'app/build/outputs/apk/release/app-prd-release.apk',
       mapping: 'app/build/outputs/apk/release/mapping.txt',
       track: 'alpha',
       skip_upload_apk: false,