diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index a65e6b5dee..55f1f31d88 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -37,38 +37,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Lint analysis of the SDK
-        run: ./gradlew clean :matrix-sdk-android:lintRelease --stacktrace
+      - name: Lint analysis
+        run: ./gradlew clean :vector:lint --stacktrace
       - name: Upload reports
         uses: actions/upload-artifact@v2
         with:
-          name: linting-report-android-sdk
-          path: matrix-sdk-android/build/reports/*.*
-
-  apk-lint:
-    name: Lint APK (${{ matrix.target }})
-    runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/main'
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [ Gplay, Fdroid ]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Lint ${{ matrix.target }} release
-        run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
-      - name: Upload ${{ matrix.target }} linting report
-        uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: release-debug-linting-report-${{ matrix.target }}
+          name: lint-report
           path: |
             vector/build/reports/*.*
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 356240f5ec..cbae6a05b3 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -67,10 +67,6 @@ android {
         installOptions "-g"
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
diff --git a/matrix-sdk-android/lint.xml b/matrix-sdk-android/lint.xml
deleted file mode 100644
index 134aba822b..0000000000
--- a/matrix-sdk-android/lint.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <!-- Modify some severity -->
-
-    <!-- Resource -->
-    <issue id="MissingTranslation" severity="warning" />
-    <issue id="TypographyEllipsis" severity="error" />
-    <issue id="ImpliedQuantity" severity="warning" />
-
-    <!-- UX -->
-    <issue id="ButtonOrder" severity="error" />
-
-    <!-- Layout -->
-    <issue id="UnknownIdInLayout" severity="error" />
-    <issue id="StringFormatCount" severity="error" />
-    <issue id="HardcodedText" severity="error" />
-    <issue id="SpUsage" severity="error" />
-    <issue id="ObsoleteLayoutParam" severity="error" />
-    <issue id="InefficientWeight" severity="error" />
-    <issue id="DisableBaselineAlignment" severity="error" />
-    <issue id="ScrollViewSize" severity="error" />
-
-    <!-- RTL -->
-    <issue id="RtlEnabled" severity="error" />
-    <issue id="RtlHardcoded" severity="error" />
-    <issue id="RtlSymmetry" severity="error" />
-
-    <!-- Code -->
-    <issue id="SetTextI18n" severity="error" />
-    <issue id="ViewConstructor" severity="error" />
-    <issue id="UseValueOf" severity="error" />
-    <issue id="ObsoleteSdkInt" severity="error" />
-
-</lint>
diff --git a/vector/build.gradle b/vector/build.gradle
index b153b67b12..36023c1dcc 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -284,6 +284,7 @@ android {
     lintOptions {
         lintConfig file("lint.xml")
 
+        checkDependencies true
         abortOnError true
     }