diff --git a/e1q.xml b/e1q.xml
index 9255144..30bd5ff 100644
--- a/e1q.xml
+++ b/e1q.xml
@@ -1,58 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <remove-project path="hardware/samsung/nfc" />
-  <remove-project path="hardware/qcom-caf/common" />
-
-  <!-- Device trees -->
-  <project name="android_device_samsung_e1q" path="device/samsung/e1q" remote="j7b3y" revision="lineage-22.1" />
-  <!-- Samsung common hardware -->
-  <project path="device/qcom/sepolicy_vndr/sm8650" name="samsung-sm8650/android_device_qcom_sepolicy_vndr" remote="github" revision="lineage-22.1-caf-sm8650" />
-  <project name="samsung-sm8650/android_hardware_samsung" path="hardware/samsung" revision="lineage-22.1" remote="github"/>
-  <project name="LineageOS/android_hardware_samsung_nfc" path="hardware/samsung/nfc" revision="lineage-22.1" remote="github"/>
   
-  <project name="samsung-sm8650/android_hardware_qcom_audio-ar" path="hardware/qcom-caf/sm8650/audio/primary-hal" revision="lineage-22.1-caf-sm8650" remote="github"/>
-  <project name="samsung-sm8650/android_hardware_qcom-caf_common" path="hardware/qcom-caf/common" revision="lineage-22.1" remote="github">
-        <linkfile src="os_pickup_aosp.mk" dest="hardware/qcom/Android.mk" />
-        <linkfile src="os_pickup_sepolicy_vndr.mk" dest="device/qcom/sepolicy_vndr/SEPolicy.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/msm8953/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8953/Android.mk" />
-        <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/msm8996/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8996/Android.mk" />
-        <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/msm8998/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8998/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sdm660/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sdm660/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sdm845/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sdm845/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8150/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8150/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8250/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8250/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8350/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8350/Android.mk" />
-        <linkfile src="os_pickup_audio-ar.mk" dest="hardware/qcom-caf/sm8450/audio/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8450/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8450/Android.mk" />
-        <linkfile src="os_pickup_audio-ar.mk" dest="hardware/qcom-caf/sm8550/audio/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8550/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8550/Android.mk" />
-        <linkfile src="os_pickup_audio-ar.mk" dest="hardware/qcom-caf/sm8650/audio/Android.mk" />
-        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8650/Android.bp" />
-        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8650/Android.mk" />
-    </project>
-
-  <project name="samsung-sm8650/android_hardware_qcom_display" path="hardware/qcom-caf/sm8650/display" revision="lineage-22.1-caf-sm8650" remote="github"/>
-  <project name="samsung-sm8650/android_hardware_qcom_media" path="hardware/qcom-caf/sm8650/media" revision="lineage-22.1-caf-sm8650" remote="github"/>
-  <project name="samsung-sm8650/android_vendor_qcom_opensource_agm" path="hardware/qcom-caf/sm8650/audio/agm" revision="lineage-22.1-caf-sm8650" remote="github"/>
-  <project name="samsung-sm8650/android_vendor_qcom_opensource_arpal-lx" path="hardware/qcom-caf/sm8650/audio/pal" revision="lineage-22.1-caf-sm8650" remote="github"/>
-  <project name="samsung-sm8650/android_vendor_qcom_opensource_data-ipa-cfg-mgr" path="hardware/qcom-caf/sm8650/data-ipa-cfg-mgr" revision="lineage-22.1-caf-sm8650" remote="github"/>
-  <project name="samsung-sm8650/android_vendor_qcom_opensource_dataipa" path="hardware/qcom-caf/sm8650/dataipa" revision="lineage-22.1-caf-sm8650" remote="github"/>
-
+  <project name="samsung-sm8650/android_device_samsung_e1q" path="device/samsung/e1q" revision="lineage-22.2" remote="j7b3y"/>
+  <project name="samsung-sm8650/android_device_samsung_sm8650-common" path="device/samsung/sm8650-common" revision="lineage-22.2" remote="j7b3y"/>
+    
+  <project name="LineageOS/android_hardware_samsung" path="hardware/samsung" revision="lineage-22.2" remote="github"/>
+  <project name="LineageOS/android_hardware_samsung_nfc" path="hardware/samsung/nfc" revision="lineage-22.2" remote="github"/>
+    
   <!-- Kernel -->
-  <project name="android_kernel_samsung_sm8650" path="kernel/samsung/sm8650" remote="j7b3y" revision="lineage-22.1" />
-  <project name="android_kernel_samsung_sm8650-devicetrees" path="kernel/samsung/sm8650-devicetrees" remote="j7b3y" revision="lineage-22.0" />
-  <project name="android_kernel_samsung_sm8650-modules" path="kernel/samsung/sm8650-modules" remote="j7b3y" revision="lineage-22.1" />
+  <project name="samsung-sm8650/android_kernel_samsung_sm8650" path="kernel/samsung/sm8650" remote="j7b3y" revision="lineage-22.2" />
+  <project name="samsung-sm8650/android_kernel_samsung_sm8650-devicetrees" path="kernel/samsung/sm8650-devicetrees" remote="j7b3y" revision="lineage-22.2" />
+  <project name="samsung-sm8650/android_kernel_samsung_sm8650-modules" path="kernel/samsung/sm8650-modules" remote="j7b3y" revision="lineage-22.2" />
 
   <!-- Vendor -->
-  <project name="proprietary_vendor_samsung_e1q" path="vendor/samsung/e1q" remote="j7b3y" revision="lineage-22.1" />
-</manifest>
+  <project name="samsung-sm8650/proprietary_vendor_samsung_e1q" path="vendor/samsung/e1q" remote="j7b3y" revision="lineage-22.2" />
+  <project name="samsung-sm8650/proprietary_vendor_samsung_sm8650-common" path="vendor/samsung/sm8650-common" remote="j7b3y" revision="lineage-22.2" />
+</manifest>
\ No newline at end of file
diff --git a/gapps.xml b/gapps.xml
index 8ded52e..92eb6b0 100644
--- a/gapps.xml
+++ b/gapps.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="vendor_gapps" path="vendor/gapps" remote="j7b3y" revision="cr11" />
+  <project name="android/vendor_gapps" path="vendor/gapps" remote="j7b3y" revision="cr11.3" />
 </manifest>
\ No newline at end of file
diff --git a/remote.xml b/remote.xml
index bf716ac..2c3834f 100644
--- a/remote.xml
+++ b/remote.xml
@@ -1,4 +1,4 @@
 <manifest>
     <!-- Remotes -->
-    <remote name="j7b3y" fetch="https://gitea.n4ne.com/android" />
+    <remote name="j7b3y" fetch="https://git.n4ne.com/" />
 </manifest>
\ No newline at end of file