diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml
index 9c02db9212654..121d55974a2cd 100644
--- a/.github/workflows/phpunit-mysql-sharding.yml
+++ b/.github/workflows/phpunit-mysql-sharding.yml
@@ -57,9 +57,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - mysql-versions: '8.0'
-            php-versions: '8.3'
           - mysql-versions: '8.4'
+            php-versions: '8.3'
+          - mysql-versions: '9.7'
             php-versions: '8.5'
 
     name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 55cf3b157133c..d31b8cc97bb08 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -60,9 +60,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - mysql-versions: '8.0'
-            php-versions: '8.3'
           - mysql-versions: '8.4'
+            php-versions: '8.3'
+          - mysql-versions: '9.7'
             php-versions: '8.5'
 
     name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
@@ -75,7 +75,7 @@ jobs:
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
       mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
+        image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
         ports:
           - 4444:3306/tcp
         env:
diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php
index cf5c949c0ce9d..2edb26795e4a3 100644
--- a/apps/settings/lib/SetupChecks/SupportedDatabase.php
+++ b/apps/settings/lib/SetupChecks/SupportedDatabase.php
@@ -19,8 +19,8 @@ class SupportedDatabase implements ISetupCheck {
 
 	private const MIN_MARIADB = '10.6';
 	private const MAX_MARIADB = '11.8';
-	private const MIN_MYSQL = '8.0';
-	private const MAX_MYSQL = '8.4';
+	private const MIN_MYSQL = '8.4';
+	private const MAX_MYSQL = '9.7';
 	private const MIN_POSTGRES = '14';
 	private const MAX_POSTGRES = '18';
 	private const MIN_ORACLE = '12.2';
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 7e251d1ec0350..cbaf8f65ee124 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1420,6 +1420,11 @@
       <code><![CDATA[getUsersForUserValue]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="apps/files/lib/Command/RepairTree.php">
+    <DeprecatedMethod>
+      <code><![CDATA[md5]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="apps/files/lib/Command/Scan.php">
     <DeprecatedMethod>
       <code><![CDATA[listen]]></code>
@@ -3236,6 +3241,11 @@
       <code><![CDATA[$this->request->server]]></code>
     </NoInterfaceProperties>
   </file>
+  <file src="core/Migrations/Version24000Date20211230140012.php">
+    <DeprecatedMethod>
+      <code><![CDATA[md5]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="core/Migrations/Version25000Date20220515204012.php">
     <DeprecatedConstant>
       <code><![CDATA[Types::JSON]]></code>
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 492d83d3cd271..c43b11a973dac 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -8,7 +8,6 @@
 
 namespace OC\Setup;
 
-use Doctrine\DBAL\Platforms\MySQL80Platform;
 use Doctrine\DBAL\Platforms\MySQL84Platform;
 use OC\DatabaseSetupException;
 use OC\DB\ConnectionAdapter;
@@ -30,6 +29,19 @@ public function setupDatabase(): void {
 			$connection = $this->connect(['dbname' => null]);
 		}
 
+		// for MD5 support
+		if ($connection->getDatabasePlatform() instanceof MySQL84Platform) {
+			$statement = $connection->prepare("SHOW VARIABLES LIKE 'version';");
+			$result = $statement->executeQuery();
+			$row = $result->fetchAssociative();
+			$version = $row['Value'];
+			[$major, ] = explode('.', strtolower($version));
+			if ((int)$major >= 9) {
+				$statement = $connection->prepare("INSTALL COMPONENT 'file://component_classic_hashing';");
+				$statement->executeStatement();
+			}
+		}
+
 		if ($this->tryCreateDbUser) {
 			$this->createSpecificUser('oc_admin', new ConnectionAdapter($connection));
 		}
@@ -103,12 +115,6 @@ private function createDBUser(IDBConnection $connection): void {
 				$connection->executeStatement($query, [$name,$password]);
 				$query = "CREATE USER ?@'%' IDENTIFIED WITH caching_sha2_password BY ?";
 				$connection->executeStatement($query, [$name,$password]);
-			} elseif ($connection->getDatabasePlatform() instanceof Mysql80Platform) {
-				// TODO: Remove this elseif section as soon as MySQL 8.0 is out-of-support (after April 2026)
-				$query = "CREATE USER ?@'localhost' IDENTIFIED WITH mysql_native_password BY ?";
-				$connection->executeStatement($query, [$name,$password]);
-				$query = "CREATE USER ?@'%' IDENTIFIED WITH mysql_native_password BY ?";
-				$connection->executeStatement($query, [$name,$password]);
 			} else {
 				$query = "CREATE USER ?@'localhost' IDENTIFIED BY ?";
 				$connection->executeStatement($query, [$name,$password]);
diff --git a/lib/public/DB/QueryBuilder/IFunctionBuilder.php b/lib/public/DB/QueryBuilder/IFunctionBuilder.php
index 2667f1487969a..f792e05cf6046 100644
--- a/lib/public/DB/QueryBuilder/IFunctionBuilder.php
+++ b/lib/public/DB/QueryBuilder/IFunctionBuilder.php
@@ -20,6 +20,7 @@ interface IFunctionBuilder {
 	 *
 	 * @return IQueryFunction
 	 * @since 12.0.0
+	 * @deprecated 35.0.0 - MD5 is not considered secure anymore, thus most databases have or will drop support for this function
 	 */
 	public function md5($input): IQueryFunction;