diff --git a/manifest.xml b/manifest.xml
index 401ade8..558f98c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,35 +2,6 @@
 <manifest>
 <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_r14-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" />
-    <linkfile dest="build/core" src="core" />
-    <linkfile dest="build/envsetup.sh" src="envsetup.sh" />
-    <linkfile dest="build/target" src="target" />
-    <linkfile dest="build/tools" src="tools" />
-</project>
-
-<remove-project name="platform/system/core" />
-<project path="system/core" name="platform_system_core" remote="phh" revision="android-8.1.0_r14-phh" />
-
-<remove-project name="platform/system/sepolicy" />
-<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-8.1.0_r14-phh" />
-
-<remove-project name="platform/frameworks/native" />
-<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-8.1.0_r14-phh" />
-
-<remove-project name="platform/system/vold" />
-<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-8.1.0_r14-phh" />
-
-<remove-project name="platform/system/bt" />
-<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-8.1.0_r14-phh" />
-
-<remove-project name="platform/external/selinux" />
-<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-8.1.0_r14-phh" />
-
 <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/vndk" name="vendor_vndk" remote="phh" revision="master" />
diff --git a/replace.xml b/replace.xml
new file mode 100644
index 0000000..a9c76b9
--- /dev/null
+++ b/replace.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+<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_r14-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" />
+    <linkfile dest="build/core" src="core" />
+    <linkfile dest="build/envsetup.sh" src="envsetup.sh" />
+    <linkfile dest="build/target" src="target" />
+    <linkfile dest="build/tools" src="tools" />
+</project>
+
+<remove-project name="platform/system/core" />
+<project path="system/core" name="platform_system_core" remote="phh" revision="android-8.1.0_r14-phh" />
+
+<remove-project name="platform/system/sepolicy" />
+<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-8.1.0_r14-phh" />
+
+<remove-project name="platform/frameworks/native" />
+<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-8.1.0_r14-phh" />
+
+<remove-project name="platform/system/vold" />
+<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-8.1.0_r14-phh" />
+
+<remove-project name="platform/system/bt" />
+<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-8.1.0_r14-phh" />
+
+<remove-project name="platform/external/selinux" />
+<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-8.1.0_r14-phh" />
+
+</manifest>