diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index f7673808a..6d64e65d8 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -255,6 +255,11 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Android SDK Tools
         uses: android-actions/setup-android@v2
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "sdk.dir=${ANDROID_HOME}" > local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
       - name: Fetch Status
         run: |
           git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status
@@ -308,7 +313,7 @@ jobs:
         run: |
           sed -i -e "s/16384/6144/g" gradle.properties
           echo "sdk.dir=${ANDROID_HOME}" >> local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" >> local.properties
+#          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" >> local.properties
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -362,6 +367,11 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Android SDK Tools
         uses: android-actions/setup-android@v2
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "sdk.dir=${ANDROID_HOME}" > local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
       - name: Fetch Status
         run: |
           git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status
@@ -385,7 +395,7 @@ jobs:
         run: |
           sed -i -e "s/16384/6144/g" gradle.properties
           echo "sdk.dir=${ANDROID_HOME}" >> local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" >> local.properties
+#          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" >> local.properties
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 02c41bf37..89f7f13a6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -267,6 +267,11 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Android SDK Tools
         uses: android-actions/setup-android@v2
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "sdk.dir=${ANDROID_HOME}" > local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
       - name: Fetch Status
         run: |
           git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status
@@ -319,7 +324,7 @@ jobs:
       - name: Fix Gradle Memoery
         run: |
           sed -i -e "s/16384/6144/g" gradle.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties
+#          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -469,7 +474,7 @@ jobs:
       - name: Fix Gradle Memoery
         run: |
           sed -i -e "s/16384/6144/g" gradle.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties
+#          echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties
       - name: Gradle cache
         uses: actions/cache@v2
         with: