diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index f51fb0588..afd8fb127 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -293,7 +293,7 @@ bool GPS::setup()
             gnssModel = GNSS_MODEL_UNKNOWN;
         }
 #else
-        gnssModel = GNSS_MODEL_UC6850;
+        gnssModel = GNSS_MODEL_UC6580;
 #endif
 
         if (gnssModel == GNSS_MODEL_MTK) {
@@ -311,10 +311,10 @@ bool GPS::setup()
             // Switch to Vehicle Mode, since SoftRF enables Aviation < 2g
             _serial_gps->write("$PCAS11,3*1E\r\n");
             delay(250);
-        } else if (gnssModel == GNSS_MODEL_UC6850) {
+        } else if (gnssModel == GNSS_MODEL_UC6580) {
 
-            // use GPS + GLONASS
-            _serial_gps->write("$CFGSYS,h15\r\n");
+            // use GPS L1 & L5 + BDS B1I & B2a + GLONASS L1 + GALILEO E1 & E5a + SBAS
+            _serial_gps->write("$CFGSYS,h25155\r\n");
             delay(250);
         } else if (gnssModel == GNSS_MODEL_UBLOX) {
             // Configure GNSS system to GPS+SBAS+GLONASS (Module may restart after this command)
diff --git a/src/gps/GPS.h b/src/gps/GPS.h
index d52c79182..4cbdae06b 100644
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -23,7 +23,7 @@ struct uBloxGnssModelInfo {
 typedef enum {
     GNSS_MODEL_MTK,
     GNSS_MODEL_UBLOX,
-    GNSS_MODEL_UC6850,
+    GNSS_MODEL_UC6580,
     GNSS_MODEL_UNKNOWN,
 } GnssModel_t;