diff --git a/products/oneplus7t/aospa.dependencies b/products/oneplus7t/aospa.dependencies
index 10b6dcf8..7a6aebc8 100644
--- a/products/oneplus7t/aospa.dependencies
+++ b/products/oneplus7t/aospa.dependencies
@@ -1,25 +1,25 @@
 [
     {
         "remote":       "aospa",
-        "repository":   "AOSPA/android_device_oneplus_oneplus7t",
+        "repository":   "fazilsheik96/android_device_oneplus_oneplus7t",
         "target_path":  "device/oneplus/oneplus7t",
         "revision":     "topaz"
     },
     {
         "remote":       "aospa",
-        "repository":   "AOSPA/android_device_oneplus_sm8150-common",
+        "repository":   "fazilsheik96/android_device_oneplus_sm8150-common",
         "target_path":  "device/oneplus/sm8150-common",
         "revision":     "topaz"
     },
     {
         "remote":       "github",
-        "repository":   "aospa-op7/device_oneplus_common",
+        "repository":   "fazilsheik96/device_oneplus_common",
         "target_path":  "device/oneplus/common",
         "revision":     "topaz"
     },
     {
         "remote":       "aospa",
-        "repository":   "AOSPA/android_kernel_oneplus_sm8150",
+        "repository":   "fazilsheik96/dragonheart_kernel_oneplus_sm8150",
         "target_path":  "kernel/msm-4.14",
         "revision":     "topaz"
     },
@@ -31,19 +31,12 @@
         "clone-depth":  "1"
     },
     {
-        "remote":       "blobs",
-        "repository":   "proprietary_vendor_oneplus",
+        "remote":       "aospa",
+        "repository":   "fazilsheik96/proprietary_vendor_oneplus",
         "target_path":  "vendor/oneplus",
         "revision":     "topaz",
         "clone-depth":  "1"
     },
-    {
-        "remote":       "blobs-gitlab",
-        "repository":   "proprietary_vendor_oneplus_firmware",
-        "target_path":  "vendor/oneplus/firmware",
-        "revision":     "topaz",
-        "clone-depth":  "1"
-    },
     {
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_audio",