diff --git a/aosp.xml b/aosp.xml
new file mode 100644
index 0000000..0cd470d
--- /dev/null
+++ b/aosp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <!-- CTS (AOSP) -->
+  <remove-project name="platform/cts" />
+  <project path="cts" name="platform/cts" remote="aosp" clone-depth="1"/>
+
+  <!-- Packages (AOSP) -->
+  <remove-project name="platform/packages/providers/MediaProvider" />
+  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" remote="aosp"/>
+
+</manifest>
diff --git a/aospa.xml b/aospa.xml
index 6148d2a..8a2daf1 100644
--- a/aospa.xml
+++ b/aospa.xml
@@ -25,10 +25,6 @@
   <remove-project name="platform/bootable/recovery" />
   <project path="bootable/recovery" name="AOSPA/android_bootable_recovery" remote="aospa" />
 
-  <!-- CTS (AOSP) -->
-  <remove-project name="platform/cts" />
-  <project path="cts" name="platform/cts" remote="aosp" clone-depth="1"/>
-
   <!-- Device -->
   <remove-project name="device/qcom/common" />
   <project path="device/qcom/common" name="AOSPA/android_device_qcom_common" remote="aospa" >
@@ -76,10 +72,6 @@
   <!-- Manifest -->
   <project path="manifest" name="AOSPA/manifest" remote="aospa" />
 
-  <!-- Packages (AOSP) -->
-  <remove-project name="platform/packages/providers/MediaProvider" />
-  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" remote="aosp"/>
-
   <!-- Packages (AOSPA) -->
   <project path="packages/apps/ParanoidDoze" name="AOSPA/android_packages_apps_ParanoidDoze" remote="aospa" />
   <project path="packages/apps/ParanoidHub" name="AOSPA/android_packages_apps_ParanoidHub" remote="aospa" revision="main" />
diff --git a/default.xml b/default.xml
index 7a5fc2c..9a2d1d5 100644
--- a/default.xml
+++ b/default.xml
@@ -56,6 +56,7 @@
   <remote  name="gitlab"
            fetch="https://gitlab.com" />
 
+  <include name="aosp.xml"/>
   <include name="aospa.xml"/>
   <include name="obsolete.xml"/>