diff --git a/bitnami/matomo/3/debian-9/Dockerfile b/bitnami/matomo/3/debian-9/Dockerfile
index 71984c395ca9..4b5576dad74d 100644
--- a/bitnami/matomo/3/debian-9/Dockerfile
+++ b/bitnami/matomo/3/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:stretch-r118
+FROM bitnami/minideb-extras:stretch-r125
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -7,14 +7,14 @@ RUN bitnami-pkg unpack apache-2.4.34-1 --checksum 35ab4cfd39577d1e7c5f6ef815ff27
 RUN bitnami-pkg unpack php-7.0.31-1 --checksum 820ec53b4671f5308575805afbbb48b2e870f0ff83da4746f8189b71ca31fb61
 RUN bitnami-pkg unpack mysql-client-10.1.35-0 --checksum 368b07877bfeecb697d036647a39cac0152c11543763ec1290dad783c36fdd36
 RUN bitnami-pkg install libphp-7.0.31-0 --checksum d6e6bff000d896b9dbc1407d1e01ccc81d5845ea3fd9cb9af1a63d8060c62671
-RUN bitnami-pkg unpack matomo-3.5.1-0 --checksum 68bac383512d040ef7e22b21b81be9e1e5059471c1027cda2c547c51f2652809
+RUN bitnami-pkg unpack matomo-3.6.0-0 --checksum 23b0cb1df29ff6fc505a96d01626bae0740a93b7e3bbcf2324eecae04f89ac07
 
 COPY rootfs /
 ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="matomo" \
-    BITNAMI_IMAGE_VERSION="3.5.1-debian-9-r13" \
+    BITNAMI_IMAGE_VERSION="3.6.0-debian-9-r0" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md
index 8d107eaa6a82..30fffd52e54b 100644
--- a/bitnami/matomo/README.md
+++ b/bitnami/matomo/README.md
@@ -30,8 +30,8 @@ $ docker-compose up -d
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
+* [`3-debian-9`, `3.6.0-debian-9-r0`, `3`, `3.6.0`, `3.6.0-r0`, `latest` (3/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/3.6.0-debian-9-r0/3/debian-9/Dockerfile)
 * [`3-ol-7`, `3.5.1-ol-7-r27` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/3.5.1-ol-7-r27/3/ol-7/Dockerfile)
-* [`3-debian-9`, `3.5.1-debian-9-r13`, `3`, `3.5.1`, `3.5.1-r13`, `latest` (3/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/3.5.1-debian-9-r13/3/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/matomo GitHub repo](https://github.com/bitnami/bitnami-docker-matomo).