diff --git a/.changelog/current/3324-nc35.md b/.changelog/current/3324-nc35.md
new file mode 100644
index 000000000..f9cda4d6b
--- /dev/null
+++ b/.changelog/current/3324-nc35.md
@@ -0,0 +1,4 @@
+# Maintenance
+
+- Mark app as compatible with NC35
+
diff --git a/.github/actions/deploy/appinfo/info.xml.dist b/.github/actions/deploy/appinfo/info.xml.dist
index eb5503cb5..c2c012573 100755
--- a/.github/actions/deploy/appinfo/info.xml.dist
+++ b/.github/actions/deploy/appinfo/info.xml.dist
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR AGPL-3.0-or-later
     <screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
     <dependencies>
         <php min-version="8.0"/>
-        <nextcloud min-version="31" max-version="34"/>
+        <nextcloud min-version="31" max-version="35"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/.github/actions/run-tests/reset-from-container.sh b/.github/actions/run-tests/reset-from-container.sh
index d907255b5..bf9fd6633 100755
--- a/.github/actions/run-tests/reset-from-container.sh
+++ b/.github/actions/run-tests/reset-from-container.sh
@@ -16,13 +16,11 @@ is_file_dump () {
 
 restore_mysql_dump () {
 	echo "Dropping old data from the database"
-	echo "Getting tables"
-	mariadb -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql --skip-ssl "$MYSQL_DATABASE" <<- EOF | tail -n +2 > /tmp/mysql_tables
-		SHOW TABLES;
-		EOF
-	echo "Got:"
-	cat /tmp/mysql_tables
-	cat /tmp/mysql_tables | sed 's@.*@DROP TABLE \0;@' | mysql -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql --skip-ssl "$MYSQL_DATABASE"
+	mysql -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql --skip-ssl <<- EOF
+	DROP DATABASE ${MYSQL_DATABASE};
+	CREATE DATABASE ${MYSQL_DATABASE};
+	GRANT ALL ON ${MYSQL_DATABASE}.* TO '${MYSQL_USER}'@'%';
+	EOF
 
 	echo "Restoring MySQL from single file dump"
 	local dump_file="$SF_DIR/sql/dump.sql"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5f9ac2bc7..c7fcfc2dd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -132,18 +132,18 @@ jobs:
             database:
                 - mysql
             coreVersion:
-                - 34
+                - 35
             phpVersion:
                 - "8.5"
             httpServer:
                 - "apache"
             include:
                 -   database: sqlite
-                    coreVersion: 32
+                    coreVersion: 33
                     phpVersion: "8.3"
                     httpServer: "apache"
                 -   database: pgsql
-                    coreVersion: 33
+                    coreVersion: 34
                     phpVersion: "8.4"
                     httpServer: "nginx"
                     
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2e19c62b4..350da5590 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR AGPL-3.0-or-later
     <screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
     <dependencies>
         <php min-version="8.0"/>
-        <nextcloud min-version="31" max-version="34"/>
+        <nextcloud min-version="31" max-version="35"/>
     </dependencies>
     <navigations>
         <navigation>