diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 893f965..1f7329a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,3 +1,4 @@
+---
 name: Kodi Addon-Check
 
 on: [push, pull_request]
@@ -7,17 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     name: Kodi addon checker
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Validate Addon
-      uses: xbmc/action-kodi-addon-checker@v1.2
-      with:
-        kodi-version: jarvis
-        addon-id: ${{ github.event.repository.name }}
-    - name: Validate Addon for Matrix
-      uses: xbmc/action-kodi-addon-checker@v1.2
-      with:
-        kodi-version: matrix
-        rewrite-for-matrix: true
-        addon-id: ${{ github.event.repository.name }}
-
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Validate Addon
+        uses: xbmc/action-kodi-addon-checker@v1.2
+          kodi-version: matrix
+          addon-id: ${{ github.event.repository.name }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9e6221..bd7eac2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,6 @@ jobs:
       max-parallel: 5
       matrix:
         python-version:
-          - pypy2.7
           - 3.8
           - 3.9
           - '3.10'
@@ -32,4 +31,3 @@ jobs:
       - uses: codecov/codecov-action@v3
         with:
           file: .tox/coverage.xml
-
diff --git a/addon.xml b/addon.xml
index 01f11ee..5a53314 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.media-ccc-de" name="media.ccc.de" version="0.3.0" provider-name="Tobias Gruetzmacher">
   <requires>
-    <import addon="xbmc.python" version="2.24.0"/>
-    <import addon="script.module.requests" version="2.15.1"/>
+    <import addon="xbmc.python" version="3.0.0"/>
+    <import addon="script.module.requests" version="2.22.0"/>
     <import addon="script.module.routing" version="0.2.3"/>
   </requires>
   <extension point="xbmc.python.pluginsource" library="addon.py">
diff --git a/tox.ini b/tox.ini
index bcc2312..0ee8ce5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,9 @@
 [tox]
-envlist = py27, py36, py37, py38, py39, py310, flake8
+envlist = py38, py39, py310, flake8
 skipsdist = True
 
 [gh-actions]
 python =
-    2.7: py27
-    3.6: py36
-    3.7: py37
     3.8: py38, flake8
     3.9: py39
     3.10: py310
@@ -38,7 +35,7 @@ deps =
 max-line-length = 79
 ignore = E127,E128,E241,FI12,FI14,FI15,FI50,FI51,FI53,FI54,FI55,W503
 require-code = True
-min-version = 2.7
+min-version = 3.8
 
 [pytest]
 filterwarnings = default