diff --git a/Dockerfile b/Dockerfile
index 5a5658e8e..016f56370 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:7.0.2-jdk11
+FROM gradle:7.0.4-jdk17
 
 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip
 ENV ANDROID_API_LEVEL android-31
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index c619dfcab..c3a0d58a1 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -90,13 +90,6 @@ android {
         disable 'BlockedPrivateApi'
     }
 
-    configurations {
-        all {
-            exclude group: 'commons-logging', module: 'commons-logging'
-            exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-        }
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/TMessagesProj/jni/Application.mk b/TMessagesProj/jni/Application.mk
index c29d77286..17cd89660 100644
--- a/TMessagesProj/jni/Application.mk
+++ b/TMessagesProj/jni/Application.mk
@@ -1,3 +1,3 @@
-APP_PLATFORM := android-16
+APP_PLATFORM := android-21
 NDK_TOOLCHAIN_VERSION := clang
 APP_STL := c++_static
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 01e64352d..2ae46a078 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'
     }
diff --git a/gradle.properties b/gradle.properties
index 8b5e603fe..946ba14d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
 RELEASE_KEY_PASSWORD=android
 RELEASE_KEY_ALIAS=androidkey
 RELEASE_STORE_PASSWORD=android
-org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=4096m
+org.gradle.jvmargs=-Xmx4096M
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=false