diff --git a/manifest.xml b/manifest.xml
index 10b4deb..4f83445 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,8 +2,8 @@
 <manifest>
 <remote name="phh" fetch="https://github.com/phhusson/" />
 
-<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="master" />
-<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-8.1" />
+<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="pie" />
+<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-9.0" />
 <project path="vendor/vndk" name="vendor_vndk" remote="phh" revision="master" />
 <project path="vendor/vndk-tests" name="vendor_vndk-tests" remote="phh" revision="master" />
 <project path="vendor/gapps-go" name="gapps-go" remote="phh" revision="master" />
diff --git a/replace.xml b/replace.xml
index 970d1e3..33cd622 100644
--- a/replace.xml
+++ b/replace.xml
@@ -3,7 +3,7 @@
 <remote name="phh" fetch="https://github.com/phhusson/" />
 
 <remove-project name="platform/build" />
-<project path="build/make" name="platform_build" remote="phh" revision="android-8.1.0_r43-phh">
+<project path="build/make" name="platform_build" remote="phh" revision="android-9.0.0_r1-phh">
     <copyfile dest="Makefile" src="core/root.mk" />
     <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk" />
     <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default" />
@@ -12,38 +12,45 @@
     <linkfile dest="build/target" src="target" />
     <linkfile dest="build/tools" src="tools" />
 </project>
-
+<!-- FIXME
 <remove-project name="platform/system/core" />
-<project path="system/core" name="platform_system_core" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="system/core" name="platform_system_core" remote="phh" revision="android-9.0.0_r1-phh" />
+-->
 
 <remove-project name="platform/system/sepolicy" />
-<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/frameworks/native" />
-<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/system/vold" />
-<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/system/bt" />
-<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/external/selinux" />
-<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/frameworks/base" />
-<project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/frameworks/av" />
-<project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/frameworks/opt/telephony" />
-<project path="frameworks/opt/telephony" name="platform_frameworks_opt_telephony" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="frameworks/opt/telephony" name="platform_frameworks_opt_telephony" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/system/libvintf" />
-<project path="system/libvintf" name="platform_system_libvintf" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="system/libvintf" name="platform_system_libvintf" remote="phh" revision="android-9.0.0_r1-phh" />
 
 <remove-project name="platform/system/netd" />
-<project path="system/netd" name="platform_system_netd" remote="phh" revision="android-8.1.0_r43-phh" />
+<project path="system/netd" name="platform_system_netd" remote="phh" revision="android-9.0.0_r1-phh" />
+
+<remove-project name="platform/frameworks/opt/net/wifi" />
+<project path="frameworks/opt/net/wifi" name="platform_frameworks_opt_net_wifi" remote="phh" revision="android-9.0.0_r1-phh" />
+
+<remove-project name="platform/packages/apps/Settings" />
+<project path="packages/apps/Settings" name="platform_packages_apps_settings" remote="phh" revision="android-9.0.0_r1-phh" />
 
 </manifest>