diff --git a/lib/services/alerts/ga511_road_alert_provider.dart b/lib/services/alerts/ga511_road_alert_provider.dart
index 6a7e58c..49e0b9d 100644
--- a/lib/services/alerts/ga511_road_alert_provider.dart
+++ b/lib/services/alerts/ga511_road_alert_provider.dart
@@ -14,11 +14,15 @@ class Georgia511RoadAlertProvider implements RoadAlertProvider {
     http.Client? client,
     String? backendBaseUrl,
   })  : _client = client ?? http.Client(),
-        backendBaseUrl = backendBaseUrl ??
-            const String.fromEnvironment(
-              'MOTORSIGNAL_API_URL',
-              defaultValue: 'http://127.0.0.1:8000',
-            );
+        backendBaseUrl = backendBaseUrl ?? _resolveDefaultBaseUrl();
+
+  static String _resolveDefaultBaseUrl() {
+    const apiUrl = String.fromEnvironment('MOTORSIGNAL_API_URL');
+    if (apiUrl.isNotEmpty) return apiUrl;
+    const apiBaseUrl = String.fromEnvironment('MOTORSIGNAL_API_BASE_URL');
+    if (apiBaseUrl.isNotEmpty) return apiBaseUrl;
+    return 'https://api.motorsignal.app';
+  }
 
   @override
   String get id => 'ga511_official';
diff --git a/lib/services/alerts/zyla_road_alert_provider.dart b/lib/services/alerts/zyla_road_alert_provider.dart
index 6d21ed7..a7a715a 100644
--- a/lib/services/alerts/zyla_road_alert_provider.dart
+++ b/lib/services/alerts/zyla_road_alert_provider.dart
@@ -19,11 +19,15 @@ class ZylaRoadAlertProvider implements RoadAlertProvider {
     String? backendBaseUrl,
     this.getAuthToken,
   })  : _client = client ?? http.Client(),
-        backendBaseUrl = backendBaseUrl ??
-            const String.fromEnvironment(
-              'MOTORSIGNAL_API_URL',
-              defaultValue: 'http://127.0.0.1:8000',
-            );
+        backendBaseUrl = backendBaseUrl ?? _resolveDefaultBaseUrl();
+
+  static String _resolveDefaultBaseUrl() {
+    const apiUrl = String.fromEnvironment('MOTORSIGNAL_API_URL');
+    if (apiUrl.isNotEmpty) return apiUrl;
+    const apiBaseUrl = String.fromEnvironment('MOTORSIGNAL_API_BASE_URL');
+    if (apiBaseUrl.isNotEmpty) return apiBaseUrl;
+    return 'https://api.motorsignal.app';
+  }
 
   @override
   String get id => 'zyla_waze_4814';