diff --git a/bitnami/wordpress/5/debian-10/Dockerfile b/bitnami/wordpress/5/debian-10/Dockerfile
index 7b1e8adc9cce..57b3436b39d7 100644
--- a/bitnami/wordpress/5/debian-10/Dockerfile
+++ b/bitnami/wordpress/5/debian-10/Dockerfile
@@ -26,7 +26,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_SET_HTTPS_PORT="no" \
     APACHE_SET_HTTP_PORT="no" \
     BITNAMI_APP_NAME="wordpress" \
-    BITNAMI_IMAGE_VERSION="5.3.2-debian-10-r22" \
+    BITNAMI_IMAGE_VERSION="5.3.2-debian-10-r23" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md
index 215cae301d79..d43fb864b835 100644
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -39,7 +39,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`5-ol-7`, `5.3.2-ol-7-r61` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.3.2-ol-7-r61/5/ol-7/Dockerfile)
-* [`5-debian-10`, `5.3.2-debian-10-r22`, `5`, `5.3.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.3.2-debian-10-r22/5/debian-10/Dockerfile)
+* [`5-debian-10`, `5.3.2-debian-10-r23`, `5`, `5.3.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.3.2-debian-10-r23/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).
 
diff --git a/bitnami/wordpress/docker-compose-mysql.yml b/bitnami/wordpress/docker-compose-mysql.yml
index c279a509e985..c660f9270436 100644
--- a/bitnami/wordpress/docker-compose-mysql.yml
+++ b/bitnami/wordpress/docker-compose-mysql.yml
@@ -1,30 +1,32 @@
 version: '2'
 services:
-  mariadb:
-    image: 'bitnami/mariadb:10.3-ol-7'
+  mysql:
+    image: 'bitnami/mysql:8.0'
     volumes:
-      - 'mariadb_data:/bitnami'
+      - 'mysql_data:/bitnami'
     environment:
-      - MARIADB_USER=bn_wordpress
-      - MARIADB_DATABASE=bitnami_wordpress
-      - ALLOW_EMPTY_PASSWORD=yes
+      - MYSQL_USER=bn_wordpress
+      - MYSQL_DATABASE=bitnami_wordpress
+      - MYSQL_ROOT_PASSWORD=bitnami123
+      - MYSQL_PASSWORD=bitnami123
+      - MYSQL_AUTHENTICATION_PLUGIN=mysql_native_password
   wordpress:
-    image: 'bitnami/wordpress:5-ol-7'
+    image: 'bitnami/wordpress:5'
     ports:
       - '80:80'
       - '443:443'
     volumes:
       - 'wordpress_data:/bitnami'
     depends_on:
-      - mariadb
+      - mysql
     environment:
-      - MARIADB_HOST=mariadb
+      - MARIADB_HOST=mysql
       - MARIADB_PORT_NUMBER=3306
       - WORDPRESS_DATABASE_USER=bn_wordpress
       - WORDPRESS_DATABASE_NAME=bitnami_wordpress
-      - ALLOW_EMPTY_PASSWORD=yes
+      - WORDPRESS_DATABASE_PASSWORD=bitnami123
 volumes:
-  mariadb_data:
+  mysql_data:
     driver: local
   wordpress_data:
     driver: local