diff --git a/mariadb/CHANGELOG.md b/mariadb/CHANGELOG.md
index 01f05ce7ead..8ab5abb00dc 100644
--- a/mariadb/CHANGELOG.md
+++ b/mariadb/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.7.1
+
+**Note:** Restart the add-on before upgrade if the current version is lower
+than 2.7.0! This is to ensure a clean stop right before the update (see also
+https://github.com/home-assistant/addons/issues/3566).
+
+- Increase MariaDB add-on shutdown timeout to 300s
+
 ## 2.7.0
 
 - Update to Alpine 3.19
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index ceb644ed459..bf255ff1778 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -9,8 +9,7 @@ RUN apk add --no-cache \
     pwgen
 
 ENV \
-    LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
-    S6_SERVICES_GRACETIME=18000
+    LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
 
 # Copy data
 COPY rootfs /
diff --git a/mariadb/config.yaml b/mariadb/config.yaml
index ac87fae8fdb..14688a86655 100644
--- a/mariadb/config.yaml
+++ b/mariadb/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 2.7.0
+version: 2.7.1
 slug: mariadb
 name: MariaDB
 description: A SQL database server
@@ -41,4 +41,4 @@ schema:
 services:
   - mysql:provide
 startup: system
-timeout: 20
+timeout: 300
diff --git a/mariadb/rootfs/etc/s6-overlay/s6-rc.d/mariadb-core/timeout-kill b/mariadb/rootfs/etc/s6-overlay/s6-rc.d/mariadb-core/timeout-kill
new file mode 100644
index 00000000000..94ca7aa4c37
--- /dev/null
+++ b/mariadb/rootfs/etc/s6-overlay/s6-rc.d/mariadb-core/timeout-kill
@@ -0,0 +1 @@
+295000