diff --git a/CHANGES.md b/CHANGES.md
index b02e5b82ff..8fdda34058 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@ Build 🧱:
  - Use Update Gradle Wrapper Action
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
  - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
+ - Upgrade build tools from `3.5.3` to `4.0.1`
 
 Other changes:
  - Added registration/verification automated UI tests
diff --git a/build.gradle b/build.gradle
index fdb42f8f43..59305598e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        // Warning: 3.6.3 leads to infinite gradle builds. Stick to 3.5.3 for the moment
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath "com.airbnb.okreplay:gradle-plugin:1.5.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"