diff --git a/products/alioth/aospa.dependencies b/products/alioth/aospa.dependencies
index 46a28d5b..2497c66b 100644
--- a/products/alioth/aospa.dependencies
+++ b/products/alioth/aospa.dependencies
@@ -34,7 +34,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/apollo/aospa.dependencies b/products/apollo/aospa.dependencies
index 40d1e477..1dc08b20 100644
--- a/products/apollo/aospa.dependencies
+++ b/products/apollo/aospa.dependencies
@@ -34,7 +34,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/dubai/aospa.dependencies b/products/dubai/aospa.dependencies
index 101a2da3..aeae2aad 100644
--- a/products/dubai/aospa.dependencies
+++ b/products/dubai/aospa.dependencies
@@ -27,7 +27,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-888"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/juice/aospa.dependencies b/products/juice/aospa.dependencies
index 2307022f..4ad2ecff 100644
--- a/products/juice/aospa.dependencies
+++ b/products/juice/aospa.dependencies
@@ -34,7 +34,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/lisa/aospa.dependencies b/products/lisa/aospa.dependencies
index 2daa39e1..20d3ea8f 100644
--- a/products/lisa/aospa.dependencies
+++ b/products/lisa/aospa.dependencies
@@ -21,7 +21,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-888"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/lmi/aospa.dependencies b/products/lmi/aospa.dependencies
index 557988b3..03e9fcb3 100644
--- a/products/lmi/aospa.dependencies
+++ b/products/lmi/aospa.dependencies
@@ -34,7 +34,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/lunaa/aospa.dependencies b/products/lunaa/aospa.dependencies
index 47c70c68..b1c26473 100644
--- a/products/lunaa/aospa.dependencies
+++ b/products/lunaa/aospa.dependencies
@@ -15,7 +15,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-888"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/mi439/aospa.dependencies b/products/mi439/aospa.dependencies
index f2ab9821..ad30ef66 100644
--- a/products/mi439/aospa.dependencies
+++ b/products/mi439/aospa.dependencies
@@ -34,7 +34,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-89xx"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/oneplus5/aospa.dependencies b/products/oneplus5/aospa.dependencies
index 5b658b70..ed83a6ea 100644
--- a/products/oneplus5/aospa.dependencies
+++ b/products/oneplus5/aospa.dependencies
@@ -40,7 +40,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aosp",
diff --git a/products/oneplus5t/aospa.dependencies b/products/oneplus5t/aospa.dependencies
index a6568bca..5e380484 100644
--- a/products/oneplus5t/aospa.dependencies
+++ b/products/oneplus5t/aospa.dependencies
@@ -46,7 +46,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aosp",
diff --git a/products/oneplus9/aospa.dependencies b/products/oneplus9/aospa.dependencies
index 7da59938..72d8d3f3 100644
--- a/products/oneplus9/aospa.dependencies
+++ b/products/oneplus9/aospa.dependencies
@@ -21,7 +21,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-888"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/oneplus9r/aospa.dependencies b/products/oneplus9r/aospa.dependencies
index f45e0f25..362c2d5d 100644
--- a/products/oneplus9r/aospa.dependencies
+++ b/products/oneplus9r/aospa.dependencies
@@ -33,7 +33,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/phoenix/aospa.dependencies b/products/phoenix/aospa.dependencies
index ea38ed77..4711e089 100644
--- a/products/phoenix/aospa.dependencies
+++ b/products/phoenix/aospa.dependencies
@@ -39,7 +39,7 @@
         "remote":      "aospa",
         "repository":  "AOSPA/android_hardware_qcom_gps",
         "target_path": "hardware/qcom/gps",
-        "revision":    "sapphire-855"
+        "revision":    "topaz-legacy-component"
     },
     {
         "remote":      "blobs",
diff --git a/products/phone1/aospa.dependencies b/products/phone1/aospa.dependencies
index d5f7632f..91d70349 100644
--- a/products/phone1/aospa.dependencies
+++ b/products/phone1/aospa.dependencies
@@ -21,7 +21,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-888"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/spes/aospa.dependencies b/products/spes/aospa.dependencies
index e1218ade..b2cc4404 100644
--- a/products/spes/aospa.dependencies
+++ b/products/spes/aospa.dependencies
@@ -39,7 +39,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-865"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/surya/aospa.dependencies b/products/surya/aospa.dependencies
index 54b613ac..829ae98c 100644
--- a/products/surya/aospa.dependencies
+++ b/products/surya/aospa.dependencies
@@ -27,7 +27,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-855"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",
diff --git a/products/vayu/aospa.dependencies b/products/vayu/aospa.dependencies
index 0f6a32a5..533e19bc 100644
--- a/products/vayu/aospa.dependencies
+++ b/products/vayu/aospa.dependencies
@@ -27,7 +27,7 @@
         "remote":       "aospa",
         "repository":   "AOSPA/android_hardware_qcom_gps",
         "target_path":  "hardware/qcom/gps",
-        "revision":     "topaz-855"
+        "revision":     "topaz-legacy-component"
     },
     {
         "remote":       "aospa",