diff --git a/oneplus.txt b/oneplus.txt
index bb72c39..94776de 100644
--- a/oneplus.txt
+++ b/oneplus.txt
@@ -1,25 +1,31 @@
 #!/bin/bash
 
-repo init -u https://github.com/yaap/manifest.git -b fifteen --git-lfs
-# Sync the repositories
-/opt/crave/resync.sh
-
 # Remove existing directories
+
 rm -rf device/oneplus/fajita
 rm -rf device/oneplus/sdm845-common
-rm -rf kernel/oneplus/sdm845
 rm -rf vendor/oneplus/fajita
 rm -rf vendor/oneplus/sdm845-common
+rm -rf kernel/oneplus/sdm845
 rm -rf hardware/oneplus
 
-# Clone repositories
-git clone https://github.com/uwu-gl/kernel_oneplus_sdm845 --depth=1 -b fifteen kernel/oneplus/sdm845
-git clone https://github.com/TheMuppets/proprietary_vendor_oneplus_fajita --depth=1 -b lineage-21 vendor/oneplus/fajita
-git clone https://github.com/TheMuppets/proprietary_vendor_oneplus_sdm845-common --depth=1 -b lineage-21 vendor/oneplus/sdm845-common
-git clone https://github.com/uwu-gl/device_oneplus_fajita --depth=1 -b fifteen device/oneplus/fajita
-git clone https://github.com/uwu-gl/device_oneplus_sdm845-common --depth=1 -b fifteen device/oneplus/sdm845-common
-git clone https://github.com/shinichi-c/android_hardware_oneplus --depth=1 -b lineage-21 hardware/oneplus
+# Clone repositories #
+
+# Device
+git clone https://github.com/shinichi-c/android_device_oneplus_fajita_15 --depth=1 -b lineage-22.0 device/oneplus/fajita
+git clone https://github.com/shinichi-c/android_device_oneplus_sdm845-common_15 --depth=1 -b lineage-22.0 device/oneplus/sdm845-common
+
+# Vendor
+git clone https://github.com/shinichi-c/proprietary_vendor_oneplus_fajita --depth=1 -b lineage-21 vendor/oneplus/fajita
+git clone https://github.com/shinichi-c/proprietary_vendor_oneplus_sdm845-common --depth=1 -b lineage-21 vendor/oneplus/sdm845-common
+
+# Kernel
+git clone https://github.com/LineageOS/android_kernel_oneplus_sdm845 --depth=1 -b lineage-21 kernel/oneplus/sdm845
+
+# Hardware
+git clone https://github.com/LineageOS/android_hardware_oneplus --depth=1 -b lineage-22.0 hardware/oneplus
+
 
 source build/envsetup.sh
-lunch yaap_fajita-ap3a-userdebug
+lunch aosp_fajita-ap2a-userdebug
 m bacon