diff --git a/testserver/docker_hackmd/templates/docker-compose.yml b/testserver/docker_hackmd/templates/docker-compose.yml
index 0c44787dac5ff340d2d0628b40e8320c6e0ea2cd..3eb21555a195925a71eb7138fc26f3bb7165d48b 100644
--- a/testserver/docker_hackmd/templates/docker-compose.yml
+++ b/testserver/docker_hackmd/templates/docker-compose.yml
@@ -46,6 +46,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: "hackmd"
       MYSQL_USER: "hackmd"
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
       - default
 
diff --git a/testserver/docker_icinga/templates/docker-compose.yml b/testserver/docker_icinga/templates/docker-compose.yml
index 190eefdf3e6a735d708ef81085b9402ca355a5fa..6accf07e69b786c445de66ef795ff67f038eaa1f 100644
--- a/testserver/docker_icinga/templates/docker-compose.yml
+++ b/testserver/docker_icinga/templates/docker-compose.yml
@@ -84,6 +84,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: icinga
       MYSQL_USER: icinga
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
       - default
 
diff --git a/testserver/docker_mail/templates/docker-compose.yml b/testserver/docker_mail/templates/docker-compose.yml
index 9ee707e26829a4c52e3a1419464627b80714a84b..38fec4932232634074ddf90f4dec937167ffd635 100644
--- a/testserver/docker_mail/templates/docker-compose.yml
+++ b/testserver/docker_mail/templates/docker-compose.yml
@@ -151,6 +151,7 @@ services:
       - MYSQL_USER=mailu
       - MYSQL_PASSWORD={{ mailu_db_pass }}
       - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }}
+      - MARIADB_AUTO_UPGRADE=1
 
   # Optional mailu services: Webmail
   webmail:
diff --git a/testserver/docker_uffd/templates/docker-compose.yml b/testserver/docker_uffd/templates/docker-compose.yml
index fd4b853c873b9c10b60f7f764d0a86928405c239..27ab8da499197e602d1b39de2045a3bf2c70a5e4 100644
--- a/testserver/docker_uffd/templates/docker-compose.yml
+++ b/testserver/docker_uffd/templates/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: mariadb:11.2.2
+    image: mariadb:11
     restart: always
     command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_nopad_bin']
     volumes:
diff --git a/testserver/docker_wordpress/templates/docker-compose.yml b/testserver/docker_wordpress/templates/docker-compose.yml
index e0c093ac5e5a468273a10673e28e5edfa8747db2..94f264a378b2bd88b62550909a8a474f8674e2ac 100644
--- a/testserver/docker_wordpress/templates/docker-compose.yml
+++ b/testserver/docker_wordpress/templates/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: wordpress
       MYSQL_USER: wordpress
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
       - default
 
diff --git a/verwaltung/docker_mysql/templates/docker-compose.yml b/verwaltung/docker_mysql/templates/docker-compose.yml
index 90261a81c15843edead81b178b233c20244bd424..ff4d29cc0ec6f7b65f3e8ef3f2dad5821996d6cc 100644
--- a/verwaltung/docker_mysql/templates/docker-compose.yml
+++ b/verwaltung/docker_mysql/templates/docker-compose.yml
@@ -15,4 +15,5 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pw }}"
       MYSQL_DATABASE: dummy 
       MYSQL_USER: vorstand
+      MARIADB_AUTO_UPGRADE: "1"
                                       
diff --git a/webserver/docker_hackmd/templates/docker-compose.yml b/webserver/docker_hackmd/templates/docker-compose.yml
index d9fe915aecb86dfaf110a047eb0adcc394a394ec..95eebbc540927b1932ffb738e21269e5bc6141ee 100644
--- a/webserver/docker_hackmd/templates/docker-compose.yml
+++ b/webserver/docker_hackmd/templates/docker-compose.yml
@@ -44,6 +44,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: "hackmd"
       MYSQL_USER: "hackmd"
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
       - default
 
diff --git a/webserver/docker_icinga/templates/docker-compose.yml b/webserver/docker_icinga/templates/docker-compose.yml
index f4e0ced24a2cadfe279fdf13eee7deeeabae709e..c6f8aa15b564c7f562bd8e2d323453ead52d3fe4 100644
--- a/webserver/docker_icinga/templates/docker-compose.yml
+++ b/webserver/docker_icinga/templates/docker-compose.yml
@@ -48,7 +48,7 @@ services:
 
   db:
 
-    image: mariadb:11.2.2
+    image: mariadb:11
     restart: always
     ports:
       - "{{ int_ip4 }}:{{mysql_port}}:3306"
@@ -59,6 +59,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: icinga
       MYSQL_USER: icinga
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
       - default
 
diff --git a/webserver/docker_mail/templates/docker-compose.yml b/webserver/docker_mail/templates/docker-compose.yml
index 669042ea5ac7a4352acecf3ff8640ce5fe75a041..8f128a5220e2d8f564b8d58e351f4c3ec7bba8e8 100644
--- a/webserver/docker_mail/templates/docker-compose.yml
+++ b/webserver/docker_mail/templates/docker-compose.yml
@@ -140,7 +140,7 @@ services:
 
   # Optional mailu services: Database
   db:
-    image: mariadb:11.2
+    image: mariadb:11
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     restart: always
     volumes:
@@ -151,8 +151,7 @@ services:
       - MYSQL_USER=mailu
       - MYSQL_PASSWORD={{ mailu_db_pass }}
       - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }}
-      - MARIADB_AUTO_UPGRADE="1"
-
+      - MARIADB_AUTO_UPGRADE=1
 
   # Optional mailu services: Webmail
   webmail:
diff --git a/webserver/docker_uffd/templates/docker-compose.yml b/webserver/docker_uffd/templates/docker-compose.yml
index cabfdd80d59c95595b31cc6630a433f51064b271..be7ae812c2d167d25ff899cfc342807c4e0fce0c 100644
--- a/webserver/docker_uffd/templates/docker-compose.yml
+++ b/webserver/docker_uffd/templates/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: mariadb:11.2.2
+    image: mariadb:11
     restart: always
     command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_nopad_bin']
     volumes:
@@ -10,6 +10,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: "uffd"
       MYSQL_USER: "uffd"
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
         - default
   app:
diff --git a/webserver/docker_wordpress/templates/docker-compose.yml b/webserver/docker_wordpress/templates/docker-compose.yml
index e0c093ac5e5a468273a10673e28e5edfa8747db2..94f264a378b2bd88b62550909a8a474f8674e2ac 100644
--- a/webserver/docker_wordpress/templates/docker-compose.yml
+++ b/webserver/docker_wordpress/templates/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       MYSQL_PASSWORD: "{{ mysql_user_pass }}"
       MYSQL_DATABASE: wordpress
       MYSQL_USER: wordpress
+      MARIADB_AUTO_UPGRADE: "1"
     networks:
       - default