diff --git a/bitnami/matomo/docker-compose.yml b/bitnami/matomo/docker-compose.yml
index 3e2c0b2d2ee2..2d48fad36f68 100644
--- a/bitnami/matomo/docker-compose.yml
+++ b/bitnami/matomo/docker-compose.yml
@@ -3,11 +3,19 @@ services:
   mariadb:
     image: 'bitnami/mariadb:latest'
     environment:
+      - MARIADB_USER=bn_matomo
+      - MARIADB_DATABASE=bitnami_matomo
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami'
-  piwik:
-    image: 'bitnami/piwik:latest'
+  matomo:
+    image: 'bitnami/matomo:latest'
+    environment:
+      - MARIADB_HOST=mariadb
+      - MARIADB_PORT_NUMBER=3306
+      - WORDPRESS_DATABASE_USER=bn_matomo
+      - WORDPRESS_DATABASE_NAME=bitnami_matomo
+      - ALLOW_EMPTY_PASSWORD=yes
     labels:
       kompose.service.type: nodeport
     ports:
@@ -16,9 +24,9 @@ services:
     depends_on:
       - mariadb
     volumes:
-      - 'piwik_data:/bitnami'
+      - 'matomo_data:/bitnami'
 volumes:
   mariadb_data:
     driver: local
-  piwik_data:
+  matomo_data:
     driver: local