diff --git a/default.xml b/default.xml
index 1f0803e..399c158 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-12.0.0_r28"
+  <default revision="refs/tags/android-12.1.0_r2"
            remote="aosp"
            sync-j="4" />
 
@@ -76,6 +76,11 @@
   <project path="device/google/coral" name="device/google/coral" groups="device,coral,generic_fs" />
   <project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral,generic_fs" clone-depth="1" />
   <project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral,generic_fs" />
+  <project path="device/google/gs101" name="device/google/gs101" groups="device,slider" />
+  <project path="device/google/gs101-sepolicy" name="device/google/gs101-sepolicy" groups="device,slider" />
+  <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,pdk-gs-arm" />
+  <project path="device/google/raviole" name="device/google/raviole" groups="device,slider" />
+  <project path="device/google/raviole-kernel" name="device/google/raviole-kernel" groups="device,slider" clone-depth="1" />
   <project path="device/google/redbull" name="device/google/redbull" groups="device,redbull" />
   <project path="device/google/redbull-kernel" name="device/google/redbull-kernel" groups="device,bramble,redfin" clone-depth="1" />
   <project path="device/google/redbull-sepolicy" name="device/google/redbull-sepolicy" groups="device,redbull" />
@@ -105,7 +110,6 @@
   <project path="device/ti/beagle_x15-kernel" name="device/ti/beagle-x15-kernel" groups="device,beagle_x15,pdk" clone-depth="1" />
   <project path="external/aac" name="platform/external/aac" groups="pdk" />
   <project path="external/abseil-cpp" name="platform/external/abseil-cpp" groups="pdk" />
-  <project path="external/adhd" name="platform/external/adhd" groups="pdk" />
   <project path="external/adt-infra" name="platform/external/adt-infra" groups="adt-infra,notdefault,pdk-fs" />
   <project path="external/android-clat" name="platform/external/android-clat" groups="pdk" />
   <project path="external/androidplot" name="platform/external/androidplot" groups="pdk" />
@@ -123,6 +127,8 @@
   <project path="external/arm-trusted-firmware" name="platform/external/arm-trusted-firmware" groups="pdk" />
   <project path="external/auto" name="platform/external/auto" groups="pdk" />
   <project path="external/autotest" name="platform/external/autotest" groups="pdk-fs" />
+  <project path="external/android-nn-driver" name="platform/external/android-nn-driver" groups="pdk-lassen" />
+  <project path="external/armnn" name="platform/external/armnn" groups="pdk-lassen" />
   <project path="external/avb" name="platform/external/avb" groups="pdk" />
   <project path="external/bazelbuild-rules_android" name="platform/external/bazelbuild-rules_android" groups="pdk" />
   <project path="external/bc" name="platform/external/bc" groups="pdk" />
@@ -144,6 +150,7 @@
   <project path="external/cldr" name="platform/external/cldr" groups="pdk" />
   <project path="external/cn-cbor" name="platform/external/cn-cbor" groups="pdk" />
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" />
+  <project path="external/ComputeLibrary" name="platform/external/ComputeLibrary" groups="pdk-lassen" />
   <project path="external/connectedappssdk" name="platform/external/connectedappssdk" groups="pdk" />
   <project path="external/conscrypt" name="platform/external/conscrypt" groups="pdk" />
   <project path="external/cpu_features" name="platform/external/cpu_features" groups="pdk" />
@@ -329,7 +336,7 @@
   <project path="external/lua" name="platform/external/lua" groups="pdk" />
   <project path="external/ltp" name="platform/external/ltp" groups="vts,pdk" />
   <project path="external/lz4" name="platform/external/lz4" groups="pdk" />
-  <project path="external/llvm-project" name="toolchain/llvm-project"  groups="pdk" />
+  <project path="external/llvm-project" name="toolchain/llvm-project" groups="pdk" />
   <project path="external/lzma" name="platform/external/lzma" groups="pdk" />
   <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="pdk" />
   <project path="external/markdown" name="platform/external/markdown" groups="pdk" />
@@ -474,6 +481,7 @@
   <project path="external/rust/crates/futures-task" name="platform/external/rust/crates/futures-task" groups="pdk" />
   <project path="external/rust/crates/futures-util" name="platform/external/rust/crates/futures-util" groups="pdk" />
   <project path="external/rust/crates/gdbstub" name="platform/external/rust/crates/gdbstub" groups="pdk" />
+  <project path="external/rust/crates/gdbstub_arch" name="platform/external/rust/crates/gdbstub_arch" groups="pdk" />
   <project path="external/rust/crates/getrandom" name="platform/external/rust/crates/getrandom" groups="pdk" />
   <project path="external/rust/crates/glob" name="platform/external/rust/crates/glob" groups="pdk" />
   <project path="external/rust/crates/grpcio" name="platform/external/rust/crates/grpcio" groups="pdk" />
@@ -626,6 +634,7 @@
   <project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk" />
   <project path="external/tcpdump" name="platform/external/tcpdump" groups="pdk" />
   <project path="external/tensorflow" name="platform/external/tensorflow" groups="pdk" />
+  <project path="external/TestParameterInjector" name="platform/external/TestParameterInjector" groups="pdk" />
   <project path="external/testng" name="platform/external/testng" groups="pdk" />
   <project path="external/tflite-support" name="platform/external/tflite-support" groups="pdk" />
   <project path="external/timezone-boundary-builder" name="platform/external/timezone-boundary-builder" groups="pdk" clone-depth="2" />
@@ -646,7 +655,6 @@
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot,pdk-fs" />
   <project path="external/virglrenderer" name="platform/external/virglrenderer" groups="pdk" />
   <project path="external/vixl" name="platform/external/vixl" groups="pdk" />
-  <project path="external/vm_tools/p9" name="platform/external/vm_tools/p9" groups="pdk" />
   <project path="external/vogar" name="platform/external/vogar" groups="pdk" />
   <project path="external/volley" name="platform/external/volley" groups="pdk" />
   <project path="external/vulkan-headers" name="platform/external/vulkan-headers" groups="pdk" />
@@ -709,6 +717,9 @@
   <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk" />
   <project path="hardware/google/camera" name="platform/hardware/google/camera" groups="pdk" />
   <project path="hardware/google/easel" name="platform/hardware/google/easel" groups="pdk,easel" />
+  <project path="hardware/google/gchips" name="platform/hardware/google/gchips" groups="pdk-lassen" />
+  <project path="hardware/google/graphics/common" name="platform/hardware/google/graphics/common" groups="pdk-lassen" />
+  <project path="hardware/google/graphics/gs101" name="platform/hardware/google/graphics/gs101" groups="pdk-lassen" />
   <project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk" />
   <project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="generic_fs,pixel" />
   <project path="hardware/google/pixel-sepolicy" name="platform/hardware/google/pixel-sepolicy" groups="generic_fs,pixel" />
@@ -771,10 +782,10 @@
   </project>
   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan,pdk-qcom" />
   <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
+  <project path="hardware/samsung/nfc" name="platform/hardware/samsung/nfc" groups="pdk" />
   <project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="pdk" />
   <project path="hardware/st/secure_element" name="platform/hardware/st/secure_element" groups="pdk" />
   <project path="hardware/st/secure_element2" name="platform/hardware/st/secure_element2" groups="pdk" />
-  <project path="hardware/samsung/nfc" name="platform/hardware/samsung/nfc" groups="pdk" />
   <project path="hardware/ti/am57x" name="platform/hardware/ti/am57x" groups="pdk" />
   <project path="kernel/configs" name="kernel/configs" groups="vts,pdk" />
   <project path="kernel/prebuilts/4.19/arm64" name="kernel/prebuilts/4.19/arm64" groups="pdk" clone-depth="1" />
@@ -985,13 +996,14 @@
   <project path="prebuilts/vndk/v28" name="platform/prebuilts/vndk/v28" groups="pdk" clone-depth="1" />
   <project path="prebuilts/vndk/v29" name="platform/prebuilts/vndk/v29" groups="pdk" clone-depth="1" />
   <project path="prebuilts/vndk/v30" name="platform/prebuilts/vndk/v30" groups="pdk" clone-depth="1" />
+  <project path="prebuilts/vndk/v31" name="platform/prebuilts/vndk/v31" groups="pdk" clone-depth="1" />
   <project path="sdk" name="platform/sdk" groups="pdk-cw-fs,pdk-fs" />
   <project path="system/apex" name="platform/system/apex" groups="pdk" />
   <project path="system/bt" name="platform/system/bt" groups="pdk" />
   <project path="system/bpf" name="platform/system/bpf" groups="pdk" />
   <project path="system/bpfprogs" name="platform/system/bpfprogs" groups="pdk" />
   <project path="system/ca-certificates" name="platform/system/ca-certificates" groups="pdk" />
-  <project path="system/chre" name="platform/system/chre"  groups="pdk" />
+  <project path="system/chre" name="platform/system/chre" groups="pdk" />
   <project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk" />
   <project path="system/core" name="platform/system/core" groups="pdk" />
   <project path="system/extras" name="platform/system/extras" groups="pdk" />
@@ -1079,7 +1091,7 @@
   <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" />
   <project path="tools/platform-compat" name="tools/platform-compat" groups="pdk-cw-fs,pdk-fs,pdk" />
   <project path="tools/ndkports" name="platform/tools/ndkports" groups="pdk" />
-  <project path="tools/repohooks" name="platform/tools/repohooks"  groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" />
+  <project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" />
   <project path="tools/security" name="platform/tools/security" groups="pdk,tools" />
   <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools" />
   <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
diff --git a/omni-aosp.xml b/omni-aosp.xml
index a633c37..95edb9c 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -11,7 +11,7 @@
            fetch="https://github.com/omnirom"
            review="gerrit.omnirom.org" />
 
-    <project path="build/make" name="android_build" remote="omnirom" revision="android-12.0" groups="pdk" >
+    <project path="build/make" name="android_build" remote="omnirom" revision="android-12.1" groups="pdk" >
         <copyfile src="core/root.mk" dest="Makefile" />
         <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
         <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
@@ -20,34 +20,34 @@
         <linkfile src="target" dest="build/target" />
         <linkfile src="tools" dest="build/tools" />
     </project>
-    <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-12.0" >
+    <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-12.1" >
         <linkfile src="root.bp" dest="Android.bp" />
         <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
     </project>
 
-    <project path="external/drm_hwcomposer" name="android_external_drm_hwcomposer" remote="omnirom" revision="android-12.0" />
+    <project path="external/drm_hwcomposer" name="android_external_drm_hwcomposer" remote="omnirom" revision="android-12.1" />
 
-    <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-12.0" />
-    <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-12.0" />
-    <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-12.0" />
-    <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-12.0" />
+    <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-12.1" />
+    <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-12.1" />
+    <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-12.1" />
+    <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-12.1" />
 
-    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-12.0" />
+    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-12.1" />
 
-    <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-12.0" />
-    <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-12.0" />
-    <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-12.0" />
-    <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-12.0" />
-    <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-12.0" />
-    <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-12.0" />
-    <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-12.0" />
-    <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-12.0" />
+    <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-12.1" />
+    <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-12.1" />
+    <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-12.1" />
+    <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-12.1" />
+    <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-12.1" />
+    <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-12.1" />
+    <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-12.1" />
+    <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-12.1" />
 
-    <project path="system/core" name="android_system_core" remote="omnirom" revision="android-12.0" />
-    <project path="system/security" name="android_system_security" remote="omnirom" revision="android-12.0" />
-    <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-12.0" />
-    <project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-12.0" />
-    <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-12.0" />
+    <project path="system/core" name="android_system_core" remote="omnirom" revision="android-12.1" />
+    <project path="system/security" name="android_system_security" remote="omnirom" revision="android-12.1" />
+    <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-12.1" />
+    <project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-12.1" />
+    <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-12.1" />
 
     <project path="prebuilts/gas/linux-x86" name="platform/prebuilts/gas/linux-x86" groups="pdk,linux,x86" clone-depth="1" remote="aosp" revision="592150fc8ae9f48f2e73f390961f32ca6f5f6a9f" />
 </manifest>
diff --git a/omni-default.xml b/omni-default.xml
index 0a0342e..74f5884 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -15,9 +15,9 @@
   <include name="omni-extra.xml" />
 
   <!-- OmniROM Projects -->
-  <project path="android" name="android" remote="omnirom" revision="android-12.0" />
+  <project path="android" name="android" remote="omnirom" revision="android-12.1" />
 
-  <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-12.0" />
+  <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-12.1" />
   <project path="vendor/interfaces" name="android_vendor_interfaces" remote="omnirom" revision="android-12.0" />
 
   <project path="external/libncurses" name="android_external_libncurses" remote="omnirom" revision="android-10" />
@@ -26,7 +26,7 @@
   <project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-10" />
 
   <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-12.0" />
-  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-12.0" />
+  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-12.1" />
   <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-11" />
   <project path="packages/apps/WallpaperCropper2" name="android_packages_apps_WallpaperCropper2" remote="omnirom" revision="android-12.0" />
 
diff --git a/omni-private.xml b/omni-private.xml
index 39764b1..cae106d 100644
--- a/omni-private.xml
+++ b/omni-private.xml
@@ -10,5 +10,5 @@
   <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom2" revision="android-12.0" />
   <project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom2" revision="android-12.0" />
   <project path="packages/apps/OmniRemote" name="android_packages_apps_OmniRemote" remote="omnirom2" revision="android-12.0" />
-  <project path="packages/apps/OmniControl" name="android_packages_apps_OmniControl" remote="omnirom2" revision="android-12.0" />
+  <project path="packages/apps/OmniControl" name="android_packages_apps_OmniControl" remote="omnirom2" revision="android-12.1" />
 </manifest>