diff --git a/external/nextcloud-notifications b/external/nextcloud-notifications
index 52bb4565..6205c303 160000
--- a/external/nextcloud-notifications
+++ b/external/nextcloud-notifications
@@ -1 +1 @@
-Subproject commit 52bb45654299f9d73313d6214d2a358ebae0c3e4
+Subproject commit 6205c303497c8245415ade86be5122a7e33b01d6
diff --git a/external/nextcloud-server b/external/nextcloud-server
index 494a0c10..0c867141 160000
--- a/external/nextcloud-server
+++ b/external/nextcloud-server
@@ -1 +1 @@
-Subproject commit 494a0c1073b460d4d2a5c03ff3567fc388b91e36
+Subproject commit 0c86714144f50a66e845e9ef80d4cd7e6918a4f5
diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.dart b/packages/nextcloud/lib/src/nextcloud.openapi.dart
index 08ee0bed..54a2ecb6 100644
--- a/packages/nextcloud/lib/src/nextcloud.openapi.dart
+++ b/packages/nextcloud/lib/src/nextcloud.openapi.dart
@@ -4334,7 +4334,7 @@ class NextcloudProvisioningApiUserDetails_BackendCapabilities {
 class NextcloudProvisioningApiUserDetails {
   NextcloudProvisioningApiUserDetails({
     this.enabled,
-    required this.storageLocation,
+    this.storageLocation,
     required this.id,
     required this.lastLogin,
     required this.backend,
@@ -4385,7 +4385,7 @@ class NextcloudProvisioningApiUserDetails {
 
   final bool? enabled;
 
-  final String storageLocation;
+  final String? storageLocation;
 
   final String id;
 
diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.g.dart b/packages/nextcloud/lib/src/nextcloud.openapi.g.dart
index 97e4860a..3b45fd43 100644
--- a/packages/nextcloud/lib/src/nextcloud.openapi.g.dart
+++ b/packages/nextcloud/lib/src/nextcloud.openapi.g.dart
@@ -1835,7 +1835,7 @@ NextcloudProvisioningApiUserDetails _$NextcloudProvisioningApiUserDetailsFromJso
   );
   return NextcloudProvisioningApiUserDetails(
     enabled: json['enabled'] as bool?,
-    storageLocation: json['storageLocation'] as String,
+    storageLocation: json['storageLocation'] as String?,
     id: json['id'] as String,
     lastLogin: json['lastLogin'] as int,
     backend: json['backend'] as String,
diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.json b/packages/nextcloud/lib/src/nextcloud.openapi.json
index a9cfd887..d83dd6bb 100644
--- a/packages/nextcloud/lib/src/nextcloud.openapi.json
+++ b/packages/nextcloud/lib/src/nextcloud.openapi.json
@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Nextcloud",
-    "version": "25.0.3",
+    "version": "25.0.4",
     "description": "All supported Nextcloud APIs in one",
     "license": {
       "name": "agpl",
@@ -1546,7 +1546,6 @@
       "ProvisioningApiUserDetails": {
         "type": "object",
         "required": [
-          "storageLocation",
           "id",
           "lastLogin",
           "backend",
diff --git a/packages/nextcloud/test/core.dart b/packages/nextcloud/test/core.dart
index dbb88ab1..9b37b425 100644
--- a/packages/nextcloud/test/core.dart
+++ b/packages/nextcloud/test/core.dart
@@ -26,8 +26,8 @@ Future run(final DockerImage image) async {
       expect(status.installed, true);
       expect(status.maintenance, false);
       expect(status.needsDbUpgrade, false);
-      expect(status.version, startsWith('25.0.3'));
-      expect(status.versionstring, '25.0.3');
+      expect(status.version, startsWith('25.0.4'));
+      expect(status.versionstring, '25.0.4');
       expect(status.edition, '');
       expect(status.productname, 'Nextcloud');
       expect(status.extendedSupport, false);
@@ -36,7 +36,7 @@ Future run(final DockerImage image) async {
     test('Get capabilities', () async {
       final capabilities = await client.core.getCapabilities();
       expect(capabilities.ocs.data.version.major.toString(), '25');
-      expect(capabilities.ocs.data.version.string, '25.0.3');
+      expect(capabilities.ocs.data.version.string, '25.0.4');
       expect(capabilities.ocs.data.capabilities.theming!.name, 'Nextcloud');
       expect(capabilities.ocs.data.capabilities.theming!.url, 'https://nextcloud.com');
       expect(capabilities.ocs.data.capabilities.theming!.slogan, 'a safe home for all your data');
diff --git a/specs/core.json b/specs/core.json
index 13244f60..79164db8 100644
--- a/specs/core.json
+++ b/specs/core.json
@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Core",
-    "version": "25.0.3",
+    "version": "25.0.4",
     "description": "Core functionality of Nextcloud",
     "license": {
       "name": "agpl",
diff --git a/specs/provisioning_api.json b/specs/provisioning_api.json
index 892d49f4..83a0458d 100644
--- a/specs/provisioning_api.json
+++ b/specs/provisioning_api.json
@@ -107,7 +107,6 @@
       "UserDetails": {
         "type": "object",
         "required": [
-          "storageLocation",
           "id",
           "lastLogin",
           "backend",
diff --git a/specs/templates/appinfo_core.xml b/specs/templates/appinfo_core.xml
index ab002d77..a7573c89 100644
--- a/specs/templates/appinfo_core.xml
+++ b/specs/templates/appinfo_core.xml
@@ -4,6 +4,6 @@
     <name>Core</name>
     <summary>Core functionality of Nextcloud</summary>
     <description><![CDATA[Core functionality of Nextcloud]]></description>
-    <version>25.0.3</version>
+    <version>25.0.4</version>
     <licence>agpl</licence>
 </info>
diff --git a/specs/templates/core.json b/specs/templates/core.json
index 296148fb..765157f3 100644
--- a/specs/templates/core.json
+++ b/specs/templates/core.json
@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Core",
-    "version": "25.0.3",
+    "version": "25.0.4",
     "description": "Core functionality of Nextcloud",
     "license": {
       "name": "agpl",
diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev
index 93d3417f..bc8ee761 100644
--- a/tool/Dockerfile.dev
+++ b/tool/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM nextcloud:25.0.3
+FROM nextcloud:25.0.4
 WORKDIR /usr/src/nextcloud
 RUN chown -R www-data:www-data .
 USER www-data