diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f89cd31..158fb980 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Fixed
 * [#1715](https://github.com/shlinkio/shlink/issues/1715) Fix short URL creation/edition allowing long URLs without schema. Now a validation error is thrown.
+* [#1537](https://github.com/shlinkio/shlink/issues/1537) Fix incorrect list of tags being returned for some author-only API keys.
 
 
 ## [3.5.2] - 2023-02-16
diff --git a/composer.json b/composer.json
index 202ed25e..03ff1457 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,6 @@
         "laminas/laminas-inputfilter": "^2.24",
         "laminas/laminas-servicemanager": "^3.20",
         "laminas/laminas-stdlib": "^3.16",
-        "lcobucci/jwt": "^4.3",
         "league/uri": "^6.8",
         "lstrojny/functional-php": "^1.17",
         "mezzio/mezzio": "^3.15",
@@ -46,7 +45,7 @@
         "php-middleware/request-id": "^4.1",
         "pugx/shortid-php": "^1.1",
         "ramsey/uuid": "^4.7",
-        "shlinkio/shlink-common": "^5.3.1",
+        "shlinkio/shlink-common": "^5.4",
         "shlinkio/shlink-config": "^2.4",
         "shlinkio/shlink-event-dispatcher": "^2.6",
         "shlinkio/shlink-importer": "^5.0",
diff --git a/config/autoload/entity-manager.local.php.dist b/config/autoload/entity-manager.local.php.dist
index dadc49af..abe5dd87 100644
--- a/config/autoload/entity-manager.local.php.dist
+++ b/config/autoload/entity-manager.local.php.dist
@@ -15,6 +15,14 @@ return [
 //            'dbname' => 'shlink_foo',
             'charset' => 'utf8mb4',
 
+            // MariaDB
+//            'user' => 'root',
+//            'password' => 'root',
+//            'driver' => 'pdo_mysql',
+//            'host' => 'shlink_db_maria',
+//            'dbname' => 'shlink_foo',
+//            'charset' => 'utf8mb4',
+
             // Postgres
 //            'user' => 'postgres',
 //            'password' => 'root',