diff --git a/redroid.xml b/redroid.xml
index 40e484d..5879109 100644
--- a/redroid.xml
+++ b/redroid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-    <remote name="redroid" fetch="https://github.com/remote-android/" />
+    <remote name="redroid" fetch="https://github.com/remote-android/" revision="redroid-9.0.0" />
 
     <!-- remove unused projects -->
     <remove-project name="platform/prebuilts/clang/host/darwin-x86" />
@@ -17,7 +17,7 @@
     <extend-project name="platform/external/swiftshader" revision="refs/tags/android-10.0.0_r47" />
 
     <!-- Our own components -->
-    <project path="device/redroid" name="device_redroid" groups="redroid" remote="redroid" revision="redroid-9.0.0" />
+    <project path="device/redroid" name="device_redroid" groups="redroid" remote="redroid" />
     <project path="device/redroid-prebuilts" name="device_redroid-prebuilts" groups="redroid" remote="redroid" revision="master" clone-depth="1" />
     <project path="hardware/redroid/c2" name="redroid-c2" groups="redroid" remote="redroid" revision="master" />
     <project path="hardware/redroid/gatekeeper" name="redroid-gatekeeper" groups="redroid" remote="redroid" revision="master" />
diff --git a/webview.xml b/webview.xml
index 3680451..d9590e6 100644
--- a/webview.xml
+++ b/webview.xml
@@ -2,6 +2,9 @@
 <manifest>
     <remote name="LineageOS" fetch="https://github.com/LineageOS/" />
 
+    <remove-project name="platform/external/chromium-webview" />
+    <project path="external/chromium-webview" name="chromium-webview-stub" groups="pdk redroid" remote="redroid" />
+
     <project path="external/chromium-webview/prebuilt/arm" name="android_external_chromium-webview_prebuilt_arm" groups="pdk lfs" clone-depth="1" revision="main" remote="LineageOS" />
     <project path="external/chromium-webview/prebuilt/arm64" name="android_external_chromium-webview_prebuilt_arm64" groups="pdk lfs" clone-depth="1" revision="main" remote="LineageOS" />
     <project path="external/chromium-webview/prebuilt/x86" name="android_external_chromium-webview_prebuilt_x86" groups="pdk lfs" clone-depth="1" revision="main" remote="LineageOS" />