diff --git a/cupid.xml b/cupid.xml
deleted file mode 100644
index 15a5465..0000000
--- a/cupid.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <!-- Device trees -->
-  <project name="android_device_xiaomi_cupid" path="device/xiaomi/cupid" remote="j7b3y" revision="cr11" />
-  <project name="android_device_xiaomi_sm8450-common" path="device/xiaomi/sm8450-common" remote="j7b3y" revision="cr11" />
-
-  <!-- Xiaomi common hardware -->
-  <project path="hardware/xiaomi" name="android_hardware_xiaomi" remote="j7b3y" revision="15" />
-
-  <!-- Kernel -->
-  <project name="cupid-development/android_kernel_xiaomi_sm8450" path="kernel/xiaomi/sm8450" remote="github" revision="lineage-22.0" />
-  <project name="cupid-development/android_kernel_xiaomi_sm8450-devicetrees" path="kernel/xiaomi/sm8450-devicetrees" remote="github" revision="lineage-22.0" />
-  <project name="cupid-development/android_kernel_xiaomi_sm8450-modules" path="kernel/xiaomi/sm8450-modules" remote="github" revision="lineage-22.0" />
-
-  <!-- Vendor -->
-  <project name="proprietary_vendor_xiaomi_cupid" path="vendor/xiaomi/cupid" remote="j7b3y" revision="15" />
-  <project name="proprietary_vendor_xiaomi_sm8450-common" path="vendor/xiaomi/sm8450-common" remote="j7b3y" revision="15" />
-
-  <!-- MiuiCam-->
-  <project name="cupid-development/android_device_xiaomi_miuicamera-cupid" path="device/xiaomi/miuicamera-cupid" remote="github" revision="lineage-21" />
-  <project name="proprietary_vendor_xiaomi_miuicamera-cupid" path="vendor/xiaomi/miuicamera-cupid" remote="j7b3y" revision="lineage-21" />
-</manifest>
\ No newline at end of file
diff --git a/gapps.xml b/gapps.xml
index 8ded52e..7fcf020 100644
--- a/gapps.xml
+++ b/gapps.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="vendor_gapps" path="vendor/gapps" remote="j7b3y" revision="cr11" />
+  <remote name="mindthegapps" fetch="https://gitlab.com/MindTheGapps" />
+  <project name="MindTheGapps/vendor_gapps" path="vendor/gapps" remote="mindthegapps" revision="vic" />
 </manifest>
\ No newline at end of file
diff --git a/lynx.xml b/lynx.xml
index e79ed39..433bc2d 100644
--- a/lynx.xml
+++ b/lynx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!-- Device trees -->
-  <project name="android_device_google_lynx" path="device/google/lynx" remote="j7b3y" revision="cr11" />
+  <project name="LineageOS/android_device_google_lynx" path="device/google/lynx" remote="github" revision="lineage-22.0" />
   <project name="LineageOS/android_device_google_gs201" path="device/google/gs201" remote="github" revision="lineage-22.0" />
   <project name="LineageOS/android_device_google_gs101" path="device/google/gs101" remote="github" revision="lineage-22.0" />
   <project name="LineageOS/android_device_google_gs-common" path="device/google/gs-common" remote="github" revision="lineage-22.0" />
@@ -10,5 +10,5 @@
   <project name="device/google/lynx-kernels/5.10" path="device/google/lynx-kernels/5.10" remote="aosp" />
 
   <!-- Vendor-->
-  <project name="proprietary_vendor_google_lynx" path="vendor/google/lynx" remote="j7b3y" revision="cr11" />
+  <project name="TheMuppets/proprietary_vendor_google_lynx" path="vendor/google/lynx" remote="github" revision="lineage-22.0" />
 </manifest>
diff --git a/remote.xml b/remote.xml
deleted file mode 100644
index bf716ac..0000000
--- a/remote.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<manifest>
-    <!-- Remotes -->
-    <remote name="j7b3y" fetch="https://gitea.n4ne.com/android" />
-</manifest>
\ No newline at end of file