diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index 1596dad..87d120f 100755
--- a/utils/aosp-merge.sh
+++ b/utils/aosp-merge.sh
@@ -17,6 +17,9 @@
 echo -e "Enter the AOSP ref to merge"
 read ref
 
+branch_name=${ref}"-merge"
+# echo $branch_name
+
 cd ../../../
 
 while read path;
@@ -35,11 +38,11 @@
 
     repo sync -d .
 
-    if git branch | grep "android-7.0-merge" > /dev/null; then
-        git branch -D android-7.0-merge > /dev/null
+    if git branch | grep ${branch_name} > /dev/null; then
+        git branch -D ${branch_name} > /dev/null
     fi
 
-    repo start android-7.0-merge .
+    repo start ${branch_name} .
 
     if ! git remote | grep "aosp" > /dev/null; then
         git remote add aosp https://android.googlesource.com/platform/$path > /dev/null
diff --git a/utils/aosp-push-merge.sh b/utils/aosp-push-merge.sh
index ee39ee3..eeb24b5 100755
--- a/utils/aosp-push-merge.sh
+++ b/utils/aosp-push-merge.sh
@@ -19,7 +19,7 @@
 
 url="gerrit.omnirom.org"
 port="29418"
-branch="android-7.0"
+branch="android-7.1"
 
 cd ../../../
 
diff --git a/utils/fork_aosp.sh b/utils/fork_aosp.sh
index 1f8f317..f775b89 100755
--- a/utils/fork_aosp.sh
+++ b/utils/fork_aosp.sh
@@ -4,8 +4,8 @@
 
 # Configuration
 PREFIX=android_
-BRANCH=android-7.0
-SOURCE=android-7.0.0_<INSERT_CORRECT_TAG>
+BRANCH=android-7.1
+SOURCE=android-7.1.1_r<INSERT_CORRECT_TAG>
 USERNAME=<INSERT USER>
 MANIFEST=android/default.xml
 GITHUB_ORG=omnirom
diff --git a/utils/fork_github.sh b/utils/fork_github.sh
index 183a761..c4b9a42 100755
--- a/utils/fork_github.sh
+++ b/utils/fork_github.sh
@@ -12,7 +12,7 @@
 # Configuration
 ##
 USERNAME=<INSERT USER>
-BRANCH=android-7.0
+BRANCH=android-7.1
 GERRIT=gerrit.omnirom.org
 GITHUB_ORG=omnirom