diff --git a/build-scripts/component-common.gradle b/build-scripts/component-common.gradle
index 5b4a2b20d7..b4d1d8dd31 100644
--- a/build-scripts/component-common.gradle
+++ b/build-scripts/component-common.gradle
@@ -43,6 +43,8 @@ kotlin {
 }
 
 dependencies {
+    lintChecks "androidx.lint:lint-gradle:1.0.0-alpha03"
+
     testImplementation libs.junit
     testImplementation libs.mockito
     testImplementation libs.robolectric
diff --git a/taskcluster/kinds/lint/kind.yml b/taskcluster/kinds/lint/kind.yml
index 0ab7765c70..aab358c6a2 100644
--- a/taskcluster/kinds/lint/kind.yml
+++ b/taskcluster/kinds/lint/kind.yml
@@ -27,3 +27,16 @@ tasks:
     description: "Running ktlint over all modules"
     run:
       gradlew: [ktlint]
+  lint:
+    description: "Running Gradle lint over all modules"
+      pre-gradlew:
+        - [git, submodule, update, --init]
+        - [source, taskcluster/scripts/toolchain/setup-fetched-rust-toolchain.sh]
+        - [source, taskcluster/scripts/toolchain/cross-compile-setup.sh]
+        - [source, taskcluster/scripts/toolchain/copy-libs-dir.sh, libs]
+        - [bash, '-c', 'echo "rust.targets=linux-x86-64\n" > local.properties']
+      run:
+        gradlew:
+        - 'clean'
+        - 'lint'
+      use-caches: true