diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index 89efcba..84c67e8 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -38,7 +38,7 @@
 # set this to the default remote to use in repo
 default_rem = "omnirom"
 # set this to the default revision to use (branch/tag name)
-default_rev = "android-8.1"
+default_rev = "android-9.0"
 # set this to the remote that you use for projects from your team repos
 # example fetch="https://github.com/omnirom"
 default_team_rem = "omnirom"
diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/bin/backuptool.sh
index a20454f..8b26032 100755
--- a/prebuilt/bin/backuptool.sh
+++ b/prebuilt/bin/backuptool.sh
@@ -5,7 +5,7 @@
 
 export C=/tmp/backupdir
 export S=/system
-export V=8.1
+export V=9.0
 
 export ADDOND_VERSION=1
 
diff --git a/prebuilt/common/bin/backuptool_ab.functions b/prebuilt/common/bin/backuptool_ab.functions
index 5a9ce56..f227ec1 100644
--- a/prebuilt/common/bin/backuptool_ab.functions
+++ b/prebuilt/common/bin/backuptool_ab.functions
@@ -5,7 +5,7 @@
 
 export S=/system
 export C=/postinstall/tmp/backupdir
-export V=8.1
+export V=9.0
 export backuptool_ab=true
 
 copy_file() {
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 8c5e7f6..6981ba8 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -5,7 +5,7 @@
 
 export S=/system
 export C=/postinstall/tmp/backupdir
-export V=8.1
+export V=9.0
 
 export ADDOND_VERSION=2
 
diff --git a/utils/aosp-push-merge.sh b/utils/aosp-push-merge.sh
index b41177b..d6e7fb8 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-8.1"
+branch="android-9.0"
 
 cd ../../../
 
diff --git a/utils/fork_aosp.sh b/utils/fork_aosp.sh
index fc06f2b..b3b9dee 100755
--- a/utils/fork_aosp.sh
+++ b/utils/fork_aosp.sh
@@ -4,8 +4,8 @@
 
 # Configuration
 PREFIX=android_
-BRANCH=android-8.1
-SOURCE=android-8.1.0_r<INSERT_CORRECT_TAG>
+BRANCH=android-9.0
+SOURCE=android-9.0.0_r<INSERT_CORRECT_TAG>
 USERNAME=<INSERT USER>
 MANIFEST=android/default.xml
 REMOVE=android/remove.xml