diff --git a/.bazelrc b/.bazelrc
index ee071c95e4..c6b70f1631 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -6,8 +6,6 @@ build --apple_crosstool_top=@local_config_apple_cc//:toolchain
 build --crosstool_top=@local_config_apple_cc//:toolchain
 build --host_crosstool_top=@local_config_apple_cc//:toolchain
 
-#build --swiftcopt=-whole-module-optimization
-
 build --per_file_copt=".*\.m$","@-fno-objc-msgsend-selector-stubs"
 build --per_file_copt=".*\.mm$","@-fno-objc-msgsend-selector-stubs"
 
@@ -15,26 +13,11 @@ build --features=debug_prefix_map_pwd_is_dot
 build --features=swift.cacheable_swiftmodules
 build --features=swift.debug_prefix_map
 build --features=swift.enable_vfsoverlays
+build:dbg --features=swift.emit_swiftsourceinfo
 
 build --strategy=Genrule=standalone
 build --spawn_strategy=standalone
 
 build --strategy=SwiftCompile=worker
 
-build:swift_profile --jobs=1
-build:swift_profile --local_cpu_resources=1
-build:swift_profile --features=-swift.enable_batch_mode
-build:swift_profile --experimental_ui_max_stdouterr_bytes=104857600
-build:swift_profile --@build_bazel_rules_swift//swift:copt=-Xfrontend
-build:swift_profile --@build_bazel_rules_swift//swift:copt=-warn-long-function-bodies=350
-build:swift_profile --@build_bazel_rules_swift//swift:copt=-Xfrontend
-build:swift_profile --@build_bazel_rules_swift//swift:copt=-warn-long-expression-type-checking=350
-
-common:index_build --experimental_convenience_symlinks=ignore
-common:index_build --bes_backend= --bes_results_url=
-common:index_build --nolegacy_important_outputs
-common:index_build --show_result=0
-common:index_build --define=buildNumber=10000
-common:index_build --define=telegramVersion=12.2.2
-
 common --registry=https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/main/
diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py
index f6ffbfa0a3..ebff8097e5 100644
--- a/build-system/Make/Make.py
+++ b/build-system/Make/Make.py
@@ -72,16 +72,12 @@ class BazelCommandLine:
         ]
 
         self.common_build_args = [
-            # https://github.com/bazelbuild/rules_swift
-            # If enabled the skip function bodies frontend flag is passed when using derived
-            # files generation.
-            '--features=swift.skip_function_bodies_for_derived_files',
-            
-            # Set the number of parallel processes to match the available CPU core count.
-            '--jobs={}'.format(os.cpu_count()),
         ]
 
+        num_threads = max(os.cpu_count() - 2, 2)
         self.common_debug_args = [
+            '--@build_bazel_rules_swift//swift:copt="-j"',
+            f'--@build_bazel_rules_swift//swift:copt="{num_threads}"',
         ]
 
         self.common_release_args = [
diff --git a/build-system/Make/ProjectGeneration.py b/build-system/Make/ProjectGeneration.py
index 8de469312c..93579210bd 100644
--- a/build-system/Make/ProjectGeneration.py
+++ b/build-system/Make/ProjectGeneration.py
@@ -38,6 +38,7 @@ def generate_xcodeproj(build_environment: BuildEnvironment, disable_extensions,
         project_bazel_arguments += ['--//{}:disableStripping'.format(app_target)]
 
     project_bazel_arguments += ['--features=-swift.debug_prefix_map']
+    project_bazel_arguments += ['--features=swift.emit_swiftsourceinfo']
     
     xcodeproj_bazelrc = os.path.join(build_environment.base_path, 'xcodeproj.bazelrc')
     if os.path.isfile(xcodeproj_bazelrc):