diff --git a/playbooks/roles/etherpad/templates/docker-compose.yaml.j2 b/playbooks/roles/etherpad/templates/docker-compose.yaml.j2
index f073f31c6a..c32e9ba766 100644
--- a/playbooks/roles/etherpad/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/etherpad/templates/docker-compose.yaml.j2
@@ -4,7 +4,7 @@ version: '2'
 
 services:
   mariadb:
-    image: docker.io/library/mariadb:10.4
+    image: docker.io/library/mariadb:10.11
     network_mode: host
     restart: always
     environment:
@@ -12,6 +12,7 @@ services:
       MYSQL_DATABASE: etherpad-lite
       MYSQL_USER: "{{ etherpad_db_user }}"
       MYSQL_PASSWORD: "{{ etherpad_db_password }}"
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - /var/etherpad/db:/var/lib/mysql
       - /etc/etherpad/mysql:/etc/mysql/conf.d
diff --git a/testinfra/test_etherpad.py b/testinfra/test_etherpad.py
index 6c28dddef6..a1372c5103 100644
--- a/testinfra/test_etherpad.py
+++ b/testinfra/test_etherpad.py
@@ -34,7 +34,7 @@ def test_etherpad_logs(host):
 
     mariadb_log_file = host.file('/var/log/containers/docker-mariadb.log')
     assert mariadb_log_file.exists
-    assert mariadb_log_file.contains('mysqld: ready for connections')
+    assert mariadb_log_file.contains('mariadbd: ready for connections.')
 
 def test_etherpad_4_byte_utf8(host):
     # The 🖖 utf8 character is a four byte character. This test ensures we