diff --git a/roles/compose/files/docker-compose.yaml b/roles/compose/files/docker-compose.yaml
index bc5230d..9855a78 100644
--- a/roles/compose/files/docker-compose.yaml
+++ b/roles/compose/files/docker-compose.yaml
@@ -98,7 +98,8 @@ services:
 
   # MySQL database for mail
   mysql_mail:
-    image: mysql:8.0
+    image: mysql:8.4
+    command: --mysql-native-password=ON
     volumes:
       - mysql_mail_data:/var/lib/mysql
       - mysql_mail_init_db:/docker-entrypoint-initdb.d
@@ -624,7 +625,8 @@ services:
 
   # WordPress services
   mysql_wordpress_noerpel:
-    image: mysql:8.0
+    image: mysql:8.4
+    command: --mysql-native-password=ON
     volumes:
       - mysql_wordpress_noerpel_data:/var/lib/mysql
     environment: