diff --git a/README.md b/README.md
index 621c3cef60..62accdda29 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,83 @@
 # Telegram iOS Source Code Compilation Guide
 
-1. Install the brew package manager, if you haven’t already.
-2. Install the packages yasm, cmake:
-```
-brew install yasm cmake
-```
-3. Clone the project from GitHub:
+1. Install Xcode (directly from https://developer.apple.com/download/more or using App Store).
+2. Clone the project from GitHub:
 
 ```
 git clone --recursive https://github.com/TelegramMessenger/Telegram-iOS.git
 ```
-4. Open Telegram-iOS.workspace.
-5. Open the Telegram-iOS-Fork scheme.
-6. Start the compilation process.
-7. To run the app on your device, you will need to set the correct values for the signature, .entitlements files and package IDs in accordance with your developer account values.
+
+3. Download Bazel 3.7.0
+
+```
+mkdir -p $HOME/bazel-dist
+cd $HOME/bazel-dist
+curl -O -L https://github.com/bazelbuild/bazel/releases/download/3.7.0/bazel-3.7.0-darwin-x86_64
+mv bazel-3.7.0* bazel
+```
+
+Verify that it's working
+
+```
+chmod +x bazel
+bazel --version
+```
+
+4. Adjust configuration parameters
+
+```
+mkdir -p $HOME/telegram-configuration
+cp -R build-system/example-configuration/* $HOME/telegram-configuration/
+```
+
+- Modify the values in `variables.bzl`
+- Replace the provisioning profiles in `provisioning` with valid files
+
+5. (Optional) Create a build cache directory to speed up rebuilds
+
+```
+mkdir -p "$HOME/telegram-bazel-cache"
+```
+
+5. Build the app
+
+```
+python3 build-system/Make/Make.py \
+    --bazel="$HOME/bazel-dist/bazel" \
+    --cacheDir="$HOME/telegram-bazel-cache" \
+    build \
+    --configurationPath="$HOME/telegram-configuration" \
+    --buildNumber=100001 \
+    --configuration=release_universal
+```
+
+6. (Optional) Generate an Xcode project
+
+```
+python3 build-system/Make/Make.py \
+    --bazel="$HOME/bazel-dist/bazel" \
+    --cacheDir="$HOME/telegram-bazel-cache" \
+    generateProject \
+    --configurationPath="$HOME/telegram-configuration" \
+    --disableExtensions
+```
+
+Tip: use `--disableExtensions` when developing to speed up development by not building application extensions.
+
+
+# Tips
+
+Bazel is used to build the app. In order to simplify the development setup a helper script is provided (`build-system/Make/Make.py`). See help:
+
+```
+python3 build-system/Make/Make.py --help
+python3 build-system/Make/Make.py build --help
+python3 build-system/Make/Make.py generateProject --help
+```
+
+Each release is built using specific Xcode and Bazel versions (see `versions.json`). The helper script checks the versions of installed software and reports an error if they don't match the ones specified in `versions.json`. There is flag that allows to bypass these checks:
+
+```
+python3 build-system/Make/Make.py --overrideBazelVersion build ... # Don't check the version of Bazel
+python3 build-system/Make/Make.py --overrideXcodeVersion build ... # Don't check the version of Xcode
+```
diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py
index c3bc66a953..6ba6140765 100644
--- a/build-system/Make/Make.py
+++ b/build-system/Make/Make.py
@@ -136,7 +136,7 @@ class BazelCommandLine:
                 # Always build universal Watch binaries.
                 '--watchos_cpus=armv7k,arm64_32'
             ] + self.common_release_args
-        elif configuration == 'release':
+        elif configuration == 'release_universal':
             self.configuration_args = [
                 # bazel optimized build configuration
                 '-c', 'opt',
@@ -145,7 +145,7 @@ class BazelCommandLine:
                 '--ios_multi_cpus=armv7,arm64',
 
                 # Always build universal Watch binaries.
-                '--watchos_cpus=armv7k,arm64_32'
+                '--watchos_cpus=armv7k,arm64_32',
                 
                 # Generate DSYM files when building.
                 '--apple_generate_dsym',