diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh
index 20fefd4b..ecbdbf45 100755
--- a/10.11/docker-entrypoint.sh
+++ b/10.11/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh
index 0253377e..fedb488f 100755
--- a/10.4/docker-entrypoint.sh
+++ b/10.4/docker-entrypoint.sh
@@ -610,7 +610,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mysql_upgrade --upgrade-system-tables
+	mysql_upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh
index 02234409..e8c0aca9 100755
--- a/10.5/docker-entrypoint.sh
+++ b/10.5/docker-entrypoint.sh
@@ -610,7 +610,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mysql_upgrade --upgrade-system-tables
+	mysql_upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh
index bb9aef30..d20499be 100755
--- a/10.6/docker-entrypoint.sh
+++ b/10.6/docker-entrypoint.sh
@@ -611,7 +611,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh
index 5c9fc4f0..206264f9 100755
--- a/11.0/docker-entrypoint.sh
+++ b/11.0/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh
index 5c9fc4f0..206264f9 100755
--- a/11.1/docker-entrypoint.sh
+++ b/11.1/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh
index 5c9fc4f0..206264f9 100755
--- a/11.2/docker-entrypoint.sh
+++ b/11.2/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/11.3/docker-entrypoint.sh b/11.3/docker-entrypoint.sh
index 5c9fc4f0..206264f9 100755
--- a/11.3/docker-entrypoint.sh
+++ b/11.3/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh
index 5c9fc4f0..206264f9 100755
--- a/11.4/docker-entrypoint.sh
+++ b/11.4/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh
index 5c9fc4f0..206264f9 100755
--- a/11.5/docker-entrypoint.sh
+++ b/11.5/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mariadb-upgrade --upgrade-system-tables
+	mariadb-upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 9bf76235..a46dda1c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -619,7 +619,7 @@ EOSQL
 	fi
 
 	mysql_note "Starting mariadb-upgrade"
-	mysql_upgrade --upgrade-system-tables
+	mysql_upgrade
 	mysql_note "Finished mariadb-upgrade"
 
 	mysql_note "Stopping temporary server"
diff --git a/update.sh b/update.sh
index 265a9bf4..eea9c313 100755
--- a/update.sh
+++ b/update.sh
@@ -78,7 +78,7 @@ update_version()
 		*)
 			sed -i -e '/^CMD/s/mysqld/mariadbd/' \
 				-e '/backwards compat/d' "$version/Dockerfile"
-			sed -i -e 's/mysql_upgrade\([^_]\)/mariadb-upgrade\1/' \
+			sed -i -e 's/\([\t (]\)mysql_upgrade/\1mariadb-upgrade/' \
 				-e 's/mysqldump/mariadb-dump/' \
 				-e 's/mysqladmin/mariadb-admin/' \
 				-e 's/\bmysql --protocol\b/mariadb --protocol/' \