diff --git a/.github/workflows/addon-validations.yml b/.github/workflows/addon-validations.yml
index 3d1bca7df..ce20500fb 100644
--- a/.github/workflows/addon-validations.yml
+++ b/.github/workflows/addon-validations.yml
@@ -11,8 +11,8 @@ jobs:
   addon-validations:
     if: github.repository == 'anxdpanic/plugin.video.youtube'
 
-    runs-on: ubuntu-latest
     name: Add-on Validations
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Add-on
@@ -20,23 +20,22 @@ jobs:
         with:
           path: ${{ github.event.repository.name }}
 
-      - name: Checkout kodi-addon-checker
-        uses: actions/checkout@v2
-        with:
-          repository: xbmc/addon-check
-          path: addon-check
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install addon-check/
+          python -m pip install git+https://github.com/xbmc/addon-check.git
 
-      - name: Staging
+      - name: Kodi Add-on Checker (Isengard)
+        id: kodi-addon-checker-isengard
         run: |
-          rm -rf LICENSES/
+          kodi-addon-checker ${{ github.event.repository.name }} --branch=isengard
+
+      - name: Staging for Matrix
+        run: |
+          git apply .patches/matrix-kodi-addon-checker.patch
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Kodi Add-on Checker
-        id: kodi-addon-checker
+      - name: Kodi Add-on Checker (Matrix)
+        id: kodi-addon-checker-matrix
         run: |
-          kodi-addon-checker ${{ github.event.repository.name }} --branch=isengard
+          kodi-addon-checker ${{ github.event.repository.name }} --branch=matrix