diff --git a/aosp-merger/push-merge.sh b/aosp-merger/push-merge.sh
index c5656f7..6531db6 100755
--- a/aosp-merger/push-merge.sh
+++ b/aosp-merger/push-merge.sh
@@ -36,8 +36,11 @@ readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 source "${vars_path}/common"
 
 TOP="${script_path}/../../.."
-BRANCH="${lineageos_branch}"
 STAGINGBRANCH="staging/${BRANCHSUFFIX}"
+BRANCH=$(git config --get branch.${STAGINGBRANCH}.merge | sed 's|refs/heads/||')
+if [ -z "${BRANCH}" ]; then
+    BRANCH="${lineageos_branch}"
+fi
 
 # Source build environment (needed for lineageremote)
 source "${TOP}/build/envsetup.sh"
diff --git a/aosp-merger/squash.sh b/aosp-merger/squash.sh
index 9d35669..e538905 100755
--- a/aosp-merger/squash.sh
+++ b/aosp-merger/squash.sh
@@ -44,9 +44,12 @@ readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 source "${vars_path}/common"
 
 TOP="${script_path}/../../.."
-BRANCH="${lineageos_branch}"
 STAGINGBRANCH="staging/${BRANCHSUFFIX}"
 SQUASHBRANCH="squash/${BRANCHSUFFIX}"
+BRANCH=$(git config --get branch.${STAGINGBRANCH}.merge | sed 's|refs/heads/||')
+if [ -z "${BRANCH}" ]; then
+    BRANCH="${lineageos_branch}"
+fi
 
 # List of merged repos
 PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')