diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml
index cae01543..07fb8a6b 100644
--- a/.github/workflows/matomo-tests.yml
+++ b/.github/workflows/matomo-tests.yml
@@ -1,7 +1,7 @@
 # Action for running tests
 # This file has been automatically created.
 # To recreate it you can run this command
-# ./console generate:test-action --plugin="DeviceDetectorCache" --php-versions="matomo5_min_php,matomo5_max_php" --schedule-cron="15 3 * * 6"
+# ./console generate:test-action --plugin="DeviceDetectorCache" --php-versions="matomo6_min_php,matomo6_max_php" --schedule-cron="15 3 * * 6"
 
 name: Plugin DeviceDetectorCache Tests
 
@@ -37,8 +37,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 'matomo5_min_php', 'matomo5_max_php' ]
+        php: [ 'matomo6_min_php', 'matomo6_max_php' ]
         target: ['minimum_required_matomo', 'maximum_supported_matomo']
+        database:
+          - { engine: 'Mysql', version: '8.0' }
+          - { engine: 'Mariadb', version: '10.6' }
     steps:
       - uses: actions/checkout@v3
         with:
@@ -52,6 +55,8 @@ jobs:
           plugin-name: 'DeviceDetectorCache'
           php-version: ${{ matrix.php }}
           test-type: 'PluginTests'
+          mysql-engine: ${{ matrix.database.engine }}
+          mysql-version: ${{ matrix.database.version }}
           matomo-test-branch: ${{ matrix.target }}
           artifacts-pass: ${{ secrets.ARTIFACTS_PASS }}
-          upload-artifacts: ${{ matrix.php == 'matomo5_min_php' && matrix.target == 'maximum_supported_matomo' }}
+          upload-artifacts: ${{ matrix.php == 'matomo6_min_php' && matrix.target == 'maximum_supported_matomo' && matrix.database.engine == 'Mysql' }}
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index e41da57b..7cef1a5c 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           tools: cs2pr
       - name: Install dependencies
         run:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a45c0b9c..fc498567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+6.0.0
+- Compatibility with Matomo 6.X
+
 5.0.3
 - Added plugin category for Marketplace
 
diff --git a/plugin.json b/plugin.json
index 1ead9b7d..c9ad8a2f 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,10 +1,10 @@
 {
   "name": "DeviceDetectorCache",
   "description": "Makes tracking faster by detecting many devices, operating systems, bots, and browsers from a cache.",
-  "version": "5.0.3",
+  "version": "6.0.0",
   "theme": false,
   "require": {
-    "matomo": ">=5.0.0-b1,<6.0.0-b1"
+    "matomo": ">=6.0.0-b1,<7.0.0-b1"
   },
   "authors": [
     {