diff --git a/mariadb/run.sh b/mariadb/run.sh
index efcd1de..d8dee8d 100644
--- a/mariadb/run.sh
+++ b/mariadb/run.sh
@@ -60,4 +60,10 @@ for (( i=0; i < "$RIGHTS"; i++ )); do
     mysql -e "GRANT $GRANT $DATABASE.* TO '$USERNAME'@'$HOST';" 2> /dev/null || true
 done
 
+# Register stop
+function stop_mariadb() {
+    mysqladmin shutdown
+}
+trap "stop_mariadb" SIGTERM SIGHUP
+
 wait "$MARIADB_PID"