diff --git a/composer.json b/composer.json
index 8dfeeb73..51e46b75 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
         "shlinkio/shlink-config": "dev-main#cde5d3b as 2.5",
         "shlinkio/shlink-event-dispatcher": "dev-main#faf2582 as 3.1",
         "shlinkio/shlink-importer": "dev-main#d621b20 as 5.2",
-        "shlinkio/shlink-installer": "dev-develop#c1ef08c as 8.6",
+        "shlinkio/shlink-installer": "dev-develop#c505a19 as 8.6",
         "shlinkio/shlink-ip-geolocation": "dev-main#4a1cef8 as 3.3",
         "shlinkio/shlink-json": "dev-main#e5a111c as 1.1",
         "spiral/roadrunner": "^2023.2",
diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php
index 0aa849e0..e48b0ec7 100644
--- a/config/autoload/installer.global.php
+++ b/config/autoload/installer.global.php
@@ -66,6 +66,10 @@ return [
             Option\RabbitMq\RabbitMqUserConfigOption::class,
             Option\RabbitMq\RabbitMqPasswordConfigOption::class,
             Option\RabbitMq\RabbitMqVhostConfigOption::class,
+            Option\Matomo\MatomoEnabledConfigOption::class,
+            Option\Matomo\MatomoBaseUrlConfigOption::class,
+            Option\Matomo\MatomoSiteIdConfigOption::class,
+            Option\Matomo\MatomoApiTokenConfigOption::class,
         ],
 
         'installation_commands' => [
diff --git a/config/autoload/matomo.global.php b/config/autoload/matomo.global.php
index 3fe1dd00..a72d48a4 100644
--- a/config/autoload/matomo.global.php
+++ b/config/autoload/matomo.global.php
@@ -10,7 +10,7 @@ return [
         'enabled' => (bool) EnvVars::MATOMO_ENABLED->loadFromEnv(false),
         'base_url' => EnvVars::MATOMO_BASE_URL->loadFromEnv(),
         'site_id' => EnvVars::MATOMO_SITE_ID->loadFromEnv(),
-        'token' => EnvVars::MATOMO_TOKEN->loadFromEnv(),
+        'token' => EnvVars::MATOMO_API_TOKEN->loadFromEnv(),
     ],
 
 ];
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a8fa2c5..5a0b6278 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -211,7 +211,7 @@ services:
         ports:
             - "8003:80"
         volumes:
-            # Matomo does not persist port in trusted hosts. This is needed to edit config afterwards
+            # Matomo does not persist port in trusted hosts. This is needed to edit config afterward
             # https://github.com/matomo-org/matomo/issues/9549
             - ./data/infra/matomo:/var/www/html
         links:
diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php
index d624c58e..c966043f 100644
--- a/module/Core/src/Config/EnvVars.php
+++ b/module/Core/src/Config/EnvVars.php
@@ -35,7 +35,7 @@ enum EnvVars: string
     case MATOMO_ENABLED = 'MATOMO_ENABLED';
     case MATOMO_BASE_URL = 'MATOMO_BASE_URL';
     case MATOMO_SITE_ID = 'MATOMO_SITE_ID';
-    case MATOMO_TOKEN = 'MATOMO_TOKEN';
+    case MATOMO_API_TOKEN = 'MATOMO_API_TOKEN';
     case DEFAULT_QR_CODE_SIZE = 'DEFAULT_QR_CODE_SIZE';
     case DEFAULT_QR_CODE_MARGIN = 'DEFAULT_QR_CODE_MARGIN';
     case DEFAULT_QR_CODE_FORMAT = 'DEFAULT_QR_CODE_FORMAT';