diff --git a/android/app/build.gradle b/android/app/build.gradle
index acaedaca3..77cb9ee34 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,7 +106,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 74
+        versionCode 75
         versionName "1.6.0"
         multiDexEnabled true
         ndk {
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4437bec30..70f14c6d0 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -508,18 +508,19 @@ def configure_from_env
 end
 
 def git_actions
-  if ENV['COMMIT_CHANGES_TO_GIT'] == 'true' && ENV['GIT_BRANCH'] != 'master'
+  if ENV['COMMIT_CHANGES_TO_GIT'] == 'true' && !ENV['GIT_LOCAL_BRANCH'].nil? && !ENV['GIT_LOCAL_BRANCH'].empty? && ENV['GIT_LOCAL_BRANCH'] != 'master'
     commit_message = last_git_commit[:message]
     push_to_git_remote(
         remote: ENV['GIT_REMOTE'] || 'origin',
-        local_branch: ENV['GIT_BRANCH'],
-        remote_branch: ENV['GIT_REMOTE_BRANCH'] || ENV['GIT_BRANCH'],
+        local_branch: ENV['GIT_LOCAL_BRANCH'],
+        remote_branch: ENV['GIT_REMOTE_BRANCH'] || ENV['GIT_LOCAL_BRANCH'],
         force: false,
         tags: false
     )
 
     unless ENV['GITHUB_PULL_REQUEST_API_TOKEN'].nil? || ENV['GITHUB_PULL_REQUEST_API_TOKEN'].empty?
       create_pull_request(
+          head: ENV['GIT_REMOTE_BRANCH'] || ENV['GIT_LOCAL_BRANCH'],
           repo: ENV['GITHUB_PULL_REQUEST_REPO'] || 'mattermost/mattermost-mobile',
           title: commit_message
       )