diff --git a/.github/extras.xml b/.github/extras.xml
index dae0297..1ce774f 100644
--- a/.github/extras.xml
+++ b/.github/extras.xml
@@ -11,10 +11,9 @@
     <remote name="xunmod"
             fetch="https://github.com/xunmod" />
 
-    <remove-project name="bootable-recovery" />
     <remove-project name="platform/external/openssh" />
 <!-- TWRP lives in TeamWin android-9.0 -->
-    <project path="bootable/recovery" name="android_bootable_recovery" remote="TeamWin" revision="android-9.0"/>
+    <project path="bootable/recovery-twrp" name="android_bootable_recovery" remote="TeamWin" revision="android-9.0"/>
     <project path="external/python3" name="android_external_python3" remote="TeamWin" revision="android-9.0"/>
 
 <!-- Include external LineageOS repos for bash & nano -->
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1221809..4289f0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,11 @@ jobs:
           repo sync -c -f --no-tags --no-clone-bundle -j16
           rm -rf .repo/project-objects/platform .repo/project-objects/*-*
           rm -r device/softwinner/octopus-ibt
-          curl https://github.com/xunmod/android_device_ONDA_octopus-ibt/raw/lollipop/.github/twrp.patch | patch -p1 -
+          rm -r bootable/recovery-twrp/applypatch
+          mv bootable/recovery/applypatch bootable/recovery-twrp/
+          rm -r bootable/recovery
+          mv bootable/recovery-twrp bootable/recovery
+          curl https://github.com/xunmod/android_device_ONDA_octopus-ibt/raw/lollipop/.github/twrp-gdb.patch | patch -p1 -
       - name: Build
         shell: bash
         run: |