diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index e98686a8b..5a8c72a56 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -29,6 +29,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
+          ndk: 21.1.6352462
           script: bash contrib/instrumentation.sh
 
       - name: Upload screenshot result
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 567e35c5a..535f10522 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -25,6 +25,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
+          ndk: 21.1.6352462
           script: bash contrib/instrumentation_nightly.sh
 
       - name: Upload screenshot result
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index cb6cd62a3..de3e9fa56 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:3.5.3")
+  implementation("com.android.tools.build:gradle:4.0.0")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
   implementation("com.hiya:jacoco-android:0.2")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 9b5f66a52..31067a7e0 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -34,7 +34,7 @@ object Versions {
 
   const val android_arch_lifecycle_extensions: String = "1.1.1"
 
-  const val com_android_tools_build_gradle: String = "3.5.3" // available: "4.0.0"
+  const val com_android_tools_build_gradle: String = "4.0.0"
 
   const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
 
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 58c822f62..49d079292 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -47,7 +47,7 @@ class AllProjectConfigurer {
   fun configureBaseExtension(target: Project, path: String) {
     target.configureExtension<BaseExtension> {
       setCompileSdkVersion(Config.compileSdk)
-
+      ndkVersion = "21.1.6352462"
       defaultConfig {
         setMinSdkVersion(Config.minSdk)
         setTargetSdkVersion(Config.targetSdk)
@@ -98,6 +98,7 @@ class AllProjectConfigurer {
         ignore(
           "SyntheticAccessor",
           "GoogleAppIndexingApiWarning",
+          "LockedOrientationActivity",
           //TODO stop ignoring below this
           "CheckResult",
           "LabelFor",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9458be702..1df15321f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip