diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index decfba2..1231e56 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 = "omnirom2"
 # set this to the default revision to use (branch/tag name)
-default_rev = "android-12.0"
+default_rev = "android-12.1"
 # set this to the remote that you use for projects from your team repos
 # example fetch="https://github.com/omnirom"
 default_team_rem = "omnirom2"
diff --git a/config/version.mk b/config/version.mk
index ac6e17c..9bc9ff7 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -24,7 +24,7 @@
     ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 endif
 
-ROM_BRANCH := android-12.0
+ROM_BRANCH := android-12.1
 
 # Apply it to build.prop
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/utils/aosp-push-merge.sh b/utils/aosp-push-merge.sh
index 3757443..5ffa785 100755
--- a/utils/aosp-push-merge.sh
+++ b/utils/aosp-push-merge.sh
@@ -25,7 +25,7 @@
 
 url="gerrit.omnirom.org"
 port="29418"
-branch="android-12.0"
+branch="android-12.1"
 
 cd ../../../
 
diff --git a/utils/fork_aosp.sh b/utils/fork_aosp.sh
index 4b6017d..b1596d0 100755
--- a/utils/fork_aosp.sh
+++ b/utils/fork_aosp.sh
@@ -4,8 +4,8 @@
 
 # Configuration
 PREFIX=android_
-BRANCH=android-12.0
-SOURCE=android-12.0.0_r<INSERT_CORRECT_TAG>
+BRANCH=android-12.1
+SOURCE=android-12.1.0_r<INSERT_CORRECT_TAG>
 USERNAME=<INSERT USER>
 TOKEN=<INSERT TOKEN>
 MANIFEST=android/default.xml
diff --git a/utils/fork_github.sh b/utils/fork_github.sh
index 535d4c9..e869325 100755
--- a/utils/fork_github.sh
+++ b/utils/fork_github.sh
@@ -13,7 +13,7 @@
 ##
 USERNAME=<INSERT USER>
 TOKEN=<INSERT TOKEN>
-BRANCH=android-7.1
+BRANCH=android-12.1
 GERRIT=gerrit.omnirom.org
 GITHUB_ORG=omnirom