diff --git a/utils/fork_aosp.sh b/utils/fork_aosp.sh
index 3284095..111fd62 100755
--- a/utils/fork_aosp.sh
+++ b/utils/fork_aosp.sh
@@ -3,14 +3,13 @@
 # Licensed under GPLv3
 
 # Configuration
-ANDROID_ROOT=~/omni
 PREFIX=android_
-BRANCH=android-4.4
-SOURCE=android-4.4.3_r1.1
+BRANCH=android-6.0
+SOURCE=android-6.0.1_<INSERT_CORRECT_TAG>
+USERNAME=<INSERT USER>
 MANIFEST=android/default.xml
 GITHUB_ORG=omnirom
-USERNAME=xplodwild
-GERRIT_REMOTE=ssh://gerrit.omnirom.org:29418
+GERRIT_REMOTE=ssh://$USERNAME@gerrit.omnirom.org:29418
 REMOTE_MANIFEST=omnirom
 
 # Script
@@ -36,7 +35,7 @@
 curl --user $USERNAME --data "{\"name\":\"$REPO_NAME\"}" https://api.github.com/orgs/$GITHUB_ORG/repos
 
 # Only works if you are a gerrit admin, will create the named project before pushing (gerrit then replicates to git)
-ssh -p 29418 gerrit.omnirom.org gerrit create-project --name $REPO_NAME
+ssh -p 29418 $USERNAME@gerrit.omnirom.org gerrit create-project --name $REPO_NAME
 
 echo "Creating branch $BRANCH..."
 pushd $1
diff --git a/utils/fork_github.sh b/utils/fork_github.sh
index 711be6c..99067a7 100755
--- a/utils/fork_github.sh
+++ b/utils/fork_github.sh
@@ -11,8 +11,8 @@
 ##
 # Configuration
 ##
-USERNAME=xplodwild
-BRANCH=android-4.4
+USERNAME=<INSERT USER>
+BRANCH=android-6.0
 GERRIT=gerrit.omnirom.org
 GITHUB_ORG=omnirom
 
@@ -40,7 +40,7 @@
 # Create the repository on Gerrit
 echo Creating $repo_name on Gerrit
 
-ssh -p 29418 $GERRIT gerrit create-project --name $repo_name
+ssh -p 29418 $USERNAME@$GERRIT gerrit create-project --name $repo_name
 
 # Push the repository
 cd $original_repo_name
@@ -58,7 +58,7 @@
 	git branch $BRANCH
 fi
 
-git push ssh://gerrit.omnirom.org:29418/$repo_name $BRANCH
+git push ssh://$USERNAME@gerrit.omnirom.org:29418/$repo_name $BRANCH
 
 # If pushing failed, we might want to forcepush the repository
 # to overwite what was previously there.