diff --git a/bitnami/mysql/8.0/debian-9/Dockerfile b/bitnami/mysql/8.0/debian-9/Dockerfile
index f1dd051d2d34..3542e279b412 100644
--- a/bitnami/mysql/8.0/debian-9/Dockerfile
+++ b/bitnami/mysql/8.0/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras-base:stretch-r241
+FROM bitnami/minideb-extras-base:stretch-r242
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -16,7 +16,7 @@ COPY rootfs /
 RUN /postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="mysql" \
-    BITNAMI_IMAGE_VERSION="8.0.16-debian-9-r3" \
+    BITNAMI_IMAGE_VERSION="8.0.16-debian-9-r4" \
     MYSQL_DATABASE="" \
     MYSQL_MASTER_HOST="" \
     MYSQL_MASTER_PORT_NUMBER="" \
diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md
index 25acd886374f..0ca3ea34b0f0 100644
--- a/bitnami/mysql/README.md
+++ b/bitnami/mysql/README.md
@@ -45,7 +45,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`8.0-debian-9`, `8.0.16-debian-9-r3`, `8.0`, `8.0.16`, `8.0.16-r3`, `latest` (8.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.16-debian-9-r3/8.0/debian-9/Dockerfile)
+* [`8.0-debian-9`, `8.0.16-debian-9-r4`, `8.0`, `8.0.16`, `8.0.16-r4`, `latest` (8.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.16-debian-9-r4/8.0/debian-9/Dockerfile)
 * [`8.0-ol-7`, `8.0.15-ol-7-r81` (8.0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.15-ol-7-r81/8.0/ol-7/Dockerfile)
 * [`5.7-ol-7`, `5.7.26-ol-7-r19` (5.7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.26-ol-7-r19/5.7/ol-7/Dockerfile)
 * [`5.7-debian-9`, `5.7.26-debian-9-r9`, `5.7`, `5.7.26`, `5.7.26-r9` (5.7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.26-debian-9-r9/5.7/debian-9/Dockerfile)
diff --git a/bitnami/mysql/docker-compose-replication.yml b/bitnami/mysql/docker-compose-replication.yml
index c0da5bcdbba1..06ac1b0b569f 100644
--- a/bitnami/mysql/docker-compose-replication.yml
+++ b/bitnami/mysql/docker-compose-replication.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mysql-master:
-    image: 'bitnami/mysql:5.7'
+    image: 'bitnami/mysql:8.0'
     ports:
       - '3306'
     volumes:
@@ -16,7 +16,7 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_ROOT_PASSWORD=my_root_password
   mysql-slave:
-    image: 'bitnami/mysql:5.7'
+    image: 'bitnami/mysql:8.0'
     ports:
       - '3306'
     depends_on: