diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 7ef1164..92cc447 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -243,6 +243,7 @@ docker_init_database_dir() {
 		fi
 	done
 	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
+		--cross-bootstrap \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb-image.changes b/mariadb-image.changes
index 7628e72..dc8e775 100644
--- a/mariadb-image.changes
+++ b/mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  3 08:09:36 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- update entrypoint scripts from upstream
+
 -------------------------------------------------------------------
 Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <dmueller@suse.com>