diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b0f6f40..ac744af 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -121,7 +121,9 @@ mysql_get_config() {
 docker_temp_server_start() {
 	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--expire-logs-days=0 \
-		--loose-innodb_buffer_pool_load_at_startup=0 &
+		--loose-innodb_buffer_pool_load_at_startup=0 \
+		--skip-ssl --ssl-cert='' --ssl-key='' --ssl-ca='' \
+		&
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
 	mysql_note "Waiting for server startup"
@@ -133,7 +135,9 @@ docker_temp_server_start() {
 	fi
 	local i
 	for i in {30..0}; do
-		if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
+		if docker_process_sql "${extraArgs[@]}" --database=mysql \
+			--skip-ssl --skip-ssl-verify-server-cert \
+			<<<'SELECT 1' &> /dev/null; then
 			break
 		fi
 		sleep 1
diff --git a/healthcheck.sh b/healthcheck.sh
index 7a461c8..2a2e8dc 100644
--- a/healthcheck.sh
+++ b/healthcheck.sh
@@ -42,6 +42,7 @@ _process_sql()
 		${def['file']:+--defaults-file=${def['file']}} \
 		${def['extra_file']:+--defaults-extra-file=${def['extra_file']}} \
 		${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}} \
+		--skip-ssl --skip-ssl-verify-server-cert \
 		-B "$@"
 }
 
@@ -62,6 +63,7 @@ connect()
 		${def['file']:+--defaults-file=${def['file']}} \
 		${def['extra_file']:+--defaults-extra-file=${def['extra_file']}}  \
 		${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}}  \
+		--skip-ssl --skip-ssl-verify-server-cert \
 		-h localhost --protocol tcp -e 'select 1' 2>&1 \
 		| grep -qF "Can't connect"
 	local ret=${PIPESTATUS[1]}
diff --git a/mariadb-image.changes b/mariadb-image.changes
index 8ba613e..2bc9da3 100644
--- a/mariadb-image.changes
+++ b/mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 12 07:10:29 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- sync entrypoint script with upstream
+
 -------------------------------------------------------------------
 Wed Jun  5 15:13:27 UTC 2024 - Dirk Mueller <dmueller@suse.com>