diff --git a/.github/extras.xml b/.github/extras.xml
index 59a7ee6..bb65ce9 100644
--- a/.github/extras.xml
+++ b/.github/extras.xml
@@ -8,8 +8,8 @@
             fetch="https://github.com/LineageOS"
             review="https://review.lineageos.org" />
 
-    <remote name="xunmod"
-            fetch="https://github.com/xunmod" />
+    <remote name="github"
+            fetch="https://github.com" />
 
     <remove-project name="bootable-recovery" />
     <remove-project name="platform/external/openssh" />
@@ -24,9 +24,9 @@
     <project name="android_external_libncurses" path="external/libncurses" remote="LineageOS" revision="cm-12.1" />
     <project name="android_external_openssh" path="external/openssh" remote="LineageOS" revision="cm-12.1" />
     <project name="android_external_ntfs-3g" path="external/ntfs-3g" remote="LineageOS" revision="cm-12.1" />
-    <project name="android_device_ONDA_octopus-ibt" path="device/ONDA/octopus-ibt" remote="xunmod" revision="lollipop" />
+<!-- Applydiff -->
+    <project name="LineageOS/android_bootable_recovery" path="bootable/recovery-cm" remote="github" revision="cm-12.1" />
 
-<!-- For applydiff -->
-    <project name="android_bootable_recovery" path="bootable/recovery-cm" remote="LineageOS" revision="cm-12.1" />
+    <project name="xunmod/android_device_ONDA_octopus-ibt" path="device/ONDA/octopus-ibt" remote="github" revision="lollipop" />
 </manifest>