diff --git a/bitrise.yml b/bitrise.yml
index 26c3d5e0d..1aa0debc5 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -103,6 +103,7 @@ workflows:
         inputs:
         - is_debug_mode: 'true'
         - ios_additional_params: "--release"
+        - additional_build_params: "--dart-define=SERVER_URL=$SERVER_URL"
         - ios_codesign_identity: 'iPhone Developer: Tung Tran (B8V9X882MX)'
     - sign-apk@1: {}
     - xcode-archive@3:
diff --git a/lib/features/home/presentation/home_controller.dart b/lib/features/home/presentation/home_controller.dart
index 2b6a0dff7..effa7cc90 100644
--- a/lib/features/home/presentation/home_controller.dart
+++ b/lib/features/home/presentation/home_controller.dart
@@ -25,7 +25,7 @@ class HomeController extends GetxController {
   @override
   void onReady() {
     super.onReady();
-    if (!GetPlatform.isWeb) {
+    if (!kIsWeb) {
       _initFlutterDownloader();
     }
     _cleanupEmailCache();
diff --git a/lib/features/login/presentation/login_controller.dart b/lib/features/login/presentation/login_controller.dart
index cab1027c3..1d39f43b6 100644
--- a/lib/features/login/presentation/login_controller.dart
+++ b/lib/features/login/presentation/login_controller.dart
@@ -1,5 +1,6 @@
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
+import 'package:flutter/foundation.dart';
 import 'package:get/get.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/login/domain/state/authentication_user_state.dart';
@@ -7,6 +8,7 @@ import 'package:tmail_ui_user/features/login/domain/usecases/authentication_user
 import 'package:tmail_ui_user/features/login/presentation/state/login_state.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
+import 'package:tmail_ui_user/main/utils/app_config.dart';
 
 class LoginController extends GetxController {
 
@@ -39,7 +41,7 @@ class LoginController extends GetxController {
   Password? _parsePassword(String? password) => password != null ? Password(password.trim()) : null;
 
   void handleLoginPressed() {
-    final baseUri = _parseUri(_urlText);
+    final baseUri = kIsWeb ? _parseUri(AppConfig.baseUrl) : _parseUri(_urlText);
     final userName = _parseUserName(_userNameText);
     final password = _parsePassword(_passwordText);
     if (baseUri != null && userName != null && password != null) {
@@ -59,7 +61,7 @@ class LoginController extends GetxController {
 
   void _loginSuccessAction(AuthenticationUserViewState success) {
     loginState.value = LoginState(Right(success));
-    _dynamicUrlInterceptors.changeBaseUrl(_urlText);
+    _dynamicUrlInterceptors.changeBaseUrl(kIsWeb ? AppConfig.baseUrl : _urlText);
     _authorizationInterceptors.changeAuthorization(_userNameText, _passwordText);
     pushAndPop(AppRoutes.SESSION);
   }
diff --git a/lib/main/utils/app_config.dart b/lib/main/utils/app_config.dart
new file mode 100644
index 000000000..a4bcfc3fa
--- /dev/null
+++ b/lib/main/utils/app_config.dart
@@ -0,0 +1,4 @@
+
+class AppConfig {
+  static const baseUrl = String.fromEnvironment('SERVER_URL', defaultValue: '');
+}
\ No newline at end of file