diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e026a27..d448d16 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -82,19 +82,22 @@
     return "#{application_id}#{application_id_suffix}"
   end
 
-  desc "Define flavor name for a branch"
+  desc "Define flavor name for deploy branch"
   def getFlavorName(options)
     flavor = nil
-    if options and options[:fl_branch]
+    if options and options[:fl_branch] and ! options[:fl_branch][/.*_.*/]
       # Use option if provided
       flavor = options[:fl_branch]
     else
       # Fallback on environment variable if any
-      if ENV['BRANCH_NAME']
+      if ENV['BRANCH_NAME'] and ! ENV['BRANCH_NAME'][/.*_.*/]
         flavor = ENV['BRANCH_NAME']
       end
     end
-    if ! flavor
+    if flavor == 'master'
+      flavor = 'production'
+    end
+    if flavor == nil or flavor == ''  
       # Choose default flavor
       flavor = 'dev2'
     end
@@ -112,6 +115,7 @@
 
   desc "Display infos about the app"
   lane :info do |options|
+    UI.message("App Flavor = #{getFlavorName(options)}")
   	UI.message("App ID = #{getPackageName(options)}")
   end