diff --git a/Jenkinsfile b/Jenkinsfile
index 1a01387..84df864 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,15 +62,14 @@
     withCredentials([usernamePassword([credentialsId: id, passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USER'])]) {
         // TODO: Move git_askpass.sh as a library resource 
         withEnv(["GIT_ASKPASS=/opt/jenkins-scripts/git_askpass.sh"]) {
-            sh("git fetch --all --quiet")
             body()
         }
     }
 }
 
-def gitMerge(fromBranch, toBranch, msg) {
+def gitMerge(fromBranch, intoBranch, msg) {
     sh("""
-git checkout -b ${toBranch}
+git checkout ${intoBranch}
 git merge ${fromBranch} -m '${msg}'
     """)
 }
@@ -81,6 +80,7 @@
 }
 
 def gitLog(bottom = null, top = 'HEAD') {
+    sh("git fetch --tags --quiet")
     def from = bottom ?: 'tags/' + sh(script: "git tag -l | tail -1", returnStdout: true).trim()
     sh(script: "git --no-pager log ${from}...${top} --pretty=format:'- %s' --reverse", returnStdout: true)
 }
@@ -225,8 +225,8 @@
                 if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha')
                 withGitPassword('bot-ci-dgm', {
                     gitMerge(
-                        "${releaseFrom['remote']}/${env.BRANCH_NAME}",
-                        "${releaseFrom['remote']}/${releaseFrom['branch']}",
+                        "${env.BRANCH_NAME}",
+                        "${releaseFrom['branch']}",
                         "Merge changes from ${currentVersion['name']}-${currentVersion['code']} back into ${releaseFrom['branch']}"
                     )
                     gitPush(releaseFrom['remote'], releaseFrom['branch'])
@@ -256,8 +256,8 @@
                 echo("currentVersion = ${currentVersion.toString()}")
                 withGitPassword('bot-ci-dgm', {
                     gitMerge(
-                        "${releaseFrom['remote']}/${env.BRANCH_NAME}",
-                        "${releaseTo['remote']}/${releaseTo['branch']}",
+                        "${env.BRANCH_NAME}",
+                        "${releaseTo['branch']}",
                         "Merge changes from ${currentVersion['name']}-${currentVersion['code']} into ${releaseTo['branch']}"
                     )
                     gitPush(releaseTo['remote'], releaseTo['branch'])