diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.dart b/packages/nextcloud/lib/src/nextcloud.openapi.dart
index ad82d30c..171a72eb 100644
--- a/packages/nextcloud/lib/src/nextcloud.openapi.dart
+++ b/packages/nextcloud/lib/src/nextcloud.openapi.dart
@@ -152,8 +152,8 @@ class OCSMeta {
     required this.status,
     required this.statuscode,
     this.message,
-    required this.totalitems,
-    required this.itemsperpage,
+    this.totalitems,
+    this.itemsperpage,
   });
 
   factory OCSMeta.fromJson(Map<String, dynamic> json) => _$OCSMetaFromJson(json);
@@ -164,9 +164,9 @@ class OCSMeta {
 
   final String? message;
 
-  final String totalitems;
+  final String? totalitems;
 
-  final String itemsperpage;
+  final String? itemsperpage;
 
   // coverage:ignore-start
   Map<String, dynamic> toJson() => _$OCSMetaToJson(this);
@@ -1508,7 +1508,7 @@ class CoreClient {
   }
 
   Future<CoreServerCapabilities> getCapabilities() async {
-    var path = '/ocs/v1.php/cloud/capabilities';
+    var path = '/ocs/v2.php/cloud/capabilities';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -1525,7 +1525,7 @@ class CoreClient {
   }
 
   Future<CoreNavigationApps> getNavigationApps() async {
-    var path = '/ocs/v1.php/core/navigation/apps';
+    var path = '/ocs/v2.php/core/navigation/apps';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2807,7 +2807,7 @@ class NotificationsClient {
   final Client rootClient;
 
   Future<NotificationsListNotifications> listNotifications() async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/notifications';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/notifications';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2824,7 +2824,7 @@ class NotificationsClient {
   }
 
   Future<String> deleteAllNotifications() async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/notifications';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/notifications';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2841,7 +2841,7 @@ class NotificationsClient {
   }
 
   Future<NotificationsGetNotification> getNotification({required int id}) async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/notifications/{id}';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/notifications/{id}';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2859,7 +2859,7 @@ class NotificationsClient {
   }
 
   Future<NotificationsEmpty> deleteNotification({required int id}) async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/notifications/{id}';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/notifications/{id}';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2881,7 +2881,7 @@ class NotificationsClient {
     required String devicePublicKey,
     required String proxyServer,
   }) async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/push';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/push';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2894,7 +2894,7 @@ class NotificationsClient {
       headers,
       body,
     );
-    if (response.statusCode == 200) {
+    if (response.statusCode == 201) {
       return NotificationsPushServerRegistration.fromJson(
           json.decode(utf8.decode(response.body)) as Map<String, dynamic>);
     }
@@ -2902,7 +2902,7 @@ class NotificationsClient {
   }
 
   Future<String> removeDevice() async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/push';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/push';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -2912,7 +2912,7 @@ class NotificationsClient {
       headers,
       body,
     );
-    if (response.statusCode == 200) {
+    if (response.statusCode == 202) {
       return utf8.decode(response.body) as String;
     }
     throw ApiException.fromResponse(response); // coverage:ignore-line
@@ -2923,7 +2923,7 @@ class NotificationsClient {
     required String shortMessage,
     String longMessage = '',
   }) async {
-    var path = '/ocs/v1.php/apps/notifications/api/v2/admin_notifications/{userId}';
+    var path = '/ocs/v2.php/apps/notifications/api/v2/admin_notifications/{userId}';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3159,7 +3159,7 @@ class ProvisioningApiClient {
   final Client rootClient;
 
   Future<ProvisioningApiUser> getCurrentUser() async {
-    var path = '/ocs/v1.php/cloud/user';
+    var path = '/ocs/v2.php/cloud/user';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3176,7 +3176,7 @@ class ProvisioningApiClient {
   }
 
   Future<ProvisioningApiUser> getUser({required String userId}) async {
-    var path = '/ocs/v1.php/cloud/users/{userId}';
+    var path = '/ocs/v2.php/cloud/users/{userId}';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3696,7 +3696,7 @@ class UserStatusClient {
   final Client rootClient;
 
   Future<UserStatusFindAllStatuses> findAllStatuses() async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/statuses';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/statuses';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3713,7 +3713,7 @@ class UserStatusClient {
   }
 
   Future<UserStatusFindStatus> findStatus({required String userId}) async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/statuses/{userId}';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/statuses/{userId}';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3731,7 +3731,7 @@ class UserStatusClient {
   }
 
   Future<UserStatusGetUserStatus> getStatus() async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/user_status';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/user_status';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3748,7 +3748,7 @@ class UserStatusClient {
   }
 
   Future<UserStatusGetUserStatus> setStatus({required UserStatusType statusType}) async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/user_status/status';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/user_status/status';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3769,7 +3769,7 @@ class UserStatusClient {
     required String messageId,
     int? clearAt,
   }) async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/user_status/message/predefined';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/user_status/message/predefined';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3794,7 +3794,7 @@ class UserStatusClient {
     String? message,
     int? clearAt,
   }) async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/user_status/message/custom';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/user_status/message/custom';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3820,7 +3820,7 @@ class UserStatusClient {
   }
 
   Future clearMessage() async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/user_status/message';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/user_status/message';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3837,7 +3837,7 @@ class UserStatusClient {
   }
 
   Future<UserStatusPredefinedStatuses> findAllPredefinedStatuses() async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/predefined_statuses';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/predefined_statuses';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
@@ -3854,7 +3854,7 @@ class UserStatusClient {
   }
 
   Future<UserStatus> heartbeat({required UserStatusType status}) async {
-    var path = '/ocs/v1.php/apps/user_status/api/v1/heartbeat';
+    var path = '/ocs/v2.php/apps/user_status/api/v1/heartbeat';
     final queryParameters = <String, dynamic>{};
     final headers = <String, String>{};
     Uint8List? body;
diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.g.dart b/packages/nextcloud/lib/src/nextcloud.openapi.g.dart
index 6e83b080..a7785628 100644
--- a/packages/nextcloud/lib/src/nextcloud.openapi.g.dart
+++ b/packages/nextcloud/lib/src/nextcloud.openapi.g.dart
@@ -32,8 +32,8 @@ OCSMeta _$OCSMetaFromJson(Map<String, dynamic> json) => OCSMeta(
       status: json['status'] as String,
       statuscode: json['statuscode'] as int,
       message: json['message'] as String?,
-      totalitems: json['totalitems'] as String,
-      itemsperpage: json['itemsperpage'] as String,
+      totalitems: json['totalitems'] as String?,
+      itemsperpage: json['itemsperpage'] as String?,
     );
 
 Map<String, dynamic> _$OCSMetaToJson(OCSMeta instance) => <String, dynamic>{
diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.json b/packages/nextcloud/lib/src/nextcloud.openapi.json
index 6d290724..5e04b98e 100644
--- a/packages/nextcloud/lib/src/nextcloud.openapi.json
+++ b/packages/nextcloud/lib/src/nextcloud.openapi.json
@@ -52,9 +52,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
@@ -2142,7 +2140,7 @@
         }
       }
     },
-    "/ocs/v1.php/cloud/capabilities": {
+    "/ocs/v2.php/cloud/capabilities": {
       "get": {
         "operationId": "get-capabilities",
         "tags": [
@@ -2162,7 +2160,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/navigation/apps": {
+    "/ocs/v2.php/core/navigation/apps": {
       "get": {
         "operationId": "get-navigation-apps",
         "tags": [
@@ -3259,7 +3257,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/notifications": {
+    "/ocs/v2.php/apps/notifications/api/v2/notifications": {
       "get": {
         "operationId": "list-notifications",
         "tags": [
@@ -3297,7 +3295,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/notifications/{id}": {
+    "/ocs/v2.php/apps/notifications/api/v2/notifications/{id}": {
       "parameters": [
         {
           "name": "id",
@@ -3345,7 +3343,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/push": {
+    "/ocs/v2.php/apps/notifications/api/v2/push": {
       "post": {
         "operationId": "register-device",
         "tags": [
@@ -3379,7 +3377,7 @@
           }
         ],
         "responses": {
-          "200": {
+          "201": {
             "description": "",
             "content": {
               "application/json": {
@@ -3397,7 +3395,7 @@
           "notifications"
         ],
         "responses": {
-          "200": {
+          "202": {
             "description": "",
             "content": {
               "application/json": {
@@ -3410,7 +3408,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/admin_notifications/{userId}": {
+    "/ocs/v2.php/apps/notifications/api/v2/admin_notifications/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -3459,7 +3457,7 @@
         }
       }
     },
-    "/ocs/v1.php/cloud/user": {
+    "/ocs/v2.php/cloud/user": {
       "get": {
         "operationId": "get-current-user",
         "tags": [
@@ -3479,7 +3477,7 @@
         }
       }
     },
-    "/ocs/v1.php/cloud/users/{userId}": {
+    "/ocs/v2.php/cloud/users/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -3509,7 +3507,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/statuses": {
+    "/ocs/v2.php/apps/user_status/api/v1/statuses": {
       "get": {
         "operationId": "find-all-statuses",
         "tags": [
@@ -3529,7 +3527,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/statuses/{userId}": {
+    "/ocs/v2.php/apps/user_status/api/v1/statuses/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -3559,7 +3557,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status": {
       "get": {
         "operationId": "get-status",
         "tags": [
@@ -3579,7 +3577,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/status": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/status": {
       "put": {
         "operationId": "set-status",
         "tags": [
@@ -3609,7 +3607,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message/predefined": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message/predefined": {
       "put": {
         "operationId": "set-predefined-message",
         "tags": [
@@ -3647,7 +3645,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message/custom": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message/custom": {
       "put": {
         "operationId": "set-custom-message",
         "tags": [
@@ -3693,7 +3691,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message": {
       "delete": {
         "operationId": "clear-message",
         "tags": [
@@ -3706,7 +3704,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/predefined_statuses": {
+    "/ocs/v2.php/apps/user_status/api/v1/predefined_statuses": {
       "get": {
         "operationId": "find-all-predefined-statuses",
         "tags": [
@@ -3726,7 +3724,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/heartbeat": {
+    "/ocs/v2.php/apps/user_status/api/v1/heartbeat": {
       "put": {
         "operationId": "heartbeat",
         "tags": [
diff --git a/packages/spec_templates/bin/generate.dart b/packages/spec_templates/bin/generate.dart
index aecdfb15..b51f6c05 100644
--- a/packages/spec_templates/bin/generate.dart
+++ b/packages/spec_templates/bin/generate.dart
@@ -67,7 +67,7 @@ Future main(final List<String> args) async {
   }
 
   final routesBasePath = '${isCore ? '' : '/apps'}/$id';
-  final ocsBasePath = '/ocs/v1.php$routesBasePath';
+  final ocsBasePath = '/ocs/v2.php$routesBasePath';
 
   for (final k in routes.keys) {
     for (final route in routes[k]!) {
diff --git a/specs/core.json b/specs/core.json
index ee7b90af..0fdf2dd4 100644
--- a/specs/core.json
+++ b/specs/core.json
@@ -38,9 +38,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
@@ -1093,7 +1091,7 @@
         }
       }
     },
-    "/ocs/v1.php/cloud/capabilities": {
+    "/ocs/v2.php/cloud/capabilities": {
       "get": {
         "operationId": "get-capabilities",
         "tags": [
@@ -1113,7 +1111,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/navigation/apps": {
+    "/ocs/v2.php/core/navigation/apps": {
       "get": {
         "operationId": "get-navigation-apps",
         "tags": [
diff --git a/specs/news.json b/specs/news.json
index 770e483d..f9c3d12d 100644
--- a/specs/news.json
+++ b/specs/news.json
@@ -38,9 +38,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
diff --git a/specs/notes.json b/specs/notes.json
index 6788aeab..f8f39f6f 100644
--- a/specs/notes.json
+++ b/specs/notes.json
@@ -38,9 +38,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
diff --git a/specs/notifications.json b/specs/notifications.json
index ee878298..1b737291 100644
--- a/specs/notifications.json
+++ b/specs/notifications.json
@@ -38,9 +38,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
@@ -340,7 +338,7 @@
     }
   },
   "paths": {
-    "/ocs/v1.php/apps/notifications/api/v2/notifications": {
+    "/ocs/v2.php/apps/notifications/api/v2/notifications": {
       "get": {
         "operationId": "list-notifications",
         "tags": [
@@ -378,7 +376,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/notifications/{id}": {
+    "/ocs/v2.php/apps/notifications/api/v2/notifications/{id}": {
       "parameters": [
         {
           "name": "id",
@@ -426,7 +424,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/push": {
+    "/ocs/v2.php/apps/notifications/api/v2/push": {
       "post": {
         "operationId": "register-device",
         "tags": [
@@ -460,7 +458,7 @@
           }
         ],
         "responses": {
-          "200": {
+          "201": {
             "description": "",
             "content": {
               "application/json": {
@@ -478,7 +476,7 @@
           "notifications"
         ],
         "responses": {
-          "200": {
+          "202": {
             "description": "",
             "content": {
               "application/json": {
@@ -491,7 +489,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/v2/admin_notifications/{userId}": {
+    "/ocs/v2.php/apps/notifications/api/v2/admin_notifications/{userId}": {
       "parameters": [
         {
           "name": "userId",
diff --git a/specs/provisioning_api.json b/specs/provisioning_api.json
index a58dde21..1fcbc6c2 100644
--- a/specs/provisioning_api.json
+++ b/specs/provisioning_api.json
@@ -38,9 +38,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
@@ -294,7 +292,7 @@
     }
   },
   "paths": {
-    "/ocs/v1.php/cloud/user": {
+    "/ocs/v2.php/cloud/user": {
       "get": {
         "operationId": "get-current-user",
         "tags": [
@@ -314,7 +312,7 @@
         }
       }
     },
-    "/ocs/v1.php/cloud/users/{userId}": {
+    "/ocs/v2.php/cloud/users/{userId}": {
       "parameters": [
         {
           "name": "userId",
diff --git a/specs/templates/core.json b/specs/templates/core.json
index 14f0278b..bfb2768d 100644
--- a/specs/templates/core.json
+++ b/specs/templates/core.json
@@ -1810,7 +1810,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/capabilities": {
+    "/ocs/v2.php/core/capabilities": {
       "get": {
         "operationId": "ocs-getcapabilities-TODO",
         "tags": [
@@ -1830,7 +1830,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/config": {
+    "/ocs/v2.php/core/config": {
       "get": {
         "operationId": "ocs-getconfig-TODO",
         "tags": [
@@ -1850,7 +1850,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/check": {
+    "/ocs/v2.php/core/check": {
       "post": {
         "operationId": "ocs-personcheck-TODO",
         "tags": [
@@ -1890,7 +1890,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/key/{cloudId}": {
+    "/ocs/v2.php/core/key/{cloudId}": {
       "parameters": [
         {
           "name": "cloudId",
@@ -1920,7 +1920,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/navigation/apps": {
+    "/ocs/v2.php/core/navigation/apps": {
       "get": {
         "operationId": "navigation-getappsnavigation-TODO",
         "tags": [
@@ -1951,7 +1951,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/navigation/settings": {
+    "/ocs/v2.php/core/navigation/settings": {
       "get": {
         "operationId": "navigation-getsettingsnavigation-TODO",
         "tags": [
@@ -1982,7 +1982,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/autocomplete/get": {
+    "/ocs/v2.php/core/autocomplete/get": {
       "get": {
         "operationId": "autocomplete-get-TODO",
         "tags": [
@@ -2054,7 +2054,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/whatsnew": {
+    "/ocs/v2.php/core/whatsnew": {
       "get": {
         "operationId": "whatsnew-get-TODO",
         "tags": [
@@ -2102,7 +2102,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/getapppassword": {
+    "/ocs/v2.php/core/getapppassword": {
       "get": {
         "operationId": "apppassword-getapppassword-TODO",
         "tags": [
@@ -2122,7 +2122,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/apppassword/rotate": {
+    "/ocs/v2.php/core/apppassword/rotate": {
       "post": {
         "operationId": "apppassword-rotateapppassword-TODO",
         "tags": [
@@ -2142,7 +2142,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/apppassword": {
+    "/ocs/v2.php/core/apppassword": {
       "delete": {
         "operationId": "apppassword-deleteapppassword-TODO",
         "tags": [
@@ -2162,7 +2162,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/v1/{userId}": {
+    "/ocs/v2.php/core/v1/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -2192,7 +2192,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/resources/collections/search/{filter}": {
+    "/ocs/v2.php/core/resources/collections/search/{filter}": {
       "parameters": [
         {
           "name": "filter",
@@ -2222,7 +2222,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/resources/collections/{collectionId}": {
+    "/ocs/v2.php/core/resources/collections/{collectionId}": {
       "parameters": [
         {
           "name": "collectionId",
@@ -2352,7 +2352,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/resources/{resourceType}/{resourceId}": {
+    "/ocs/v2.php/core/resources/{resourceType}/{resourceId}": {
       "parameters": [
         {
           "name": "resourceType",
@@ -2390,7 +2390,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/resources/{baseResourceType}/{baseResourceId}": {
+    "/ocs/v2.php/core/resources/{baseResourceType}/{baseResourceId}": {
       "parameters": [
         {
           "name": "baseResourceType",
@@ -2438,7 +2438,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/resolve": {
+    "/ocs/v2.php/core/resolve": {
       "get": {
         "operationId": "referenceapi-resolveone-TODO",
         "tags": [
@@ -2505,7 +2505,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/extract": {
+    "/ocs/v2.php/core/extract": {
       "post": {
         "operationId": "referenceapi-extract-TODO",
         "tags": [
@@ -2553,7 +2553,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/{targetUserId}": {
+    "/ocs/v2.php/core/{targetUserId}": {
       "parameters": [
         {
           "name": "targetUserId",
@@ -2601,7 +2601,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/providers": {
+    "/ocs/v2.php/core/providers": {
       "get": {
         "operationId": "unifiedsearch-getproviders-TODO",
         "tags": [
@@ -2633,7 +2633,7 @@
         }
       }
     },
-    "/ocs/v1.php/core/providers/{providerId}/search": {
+    "/ocs/v2.php/core/providers/{providerId}/search": {
       "parameters": [
         {
           "name": "providerId",
diff --git a/specs/templates/notifications.json b/specs/templates/notifications.json
index 1c8eaea3..28d693a0 100644
--- a/specs/templates/notifications.json
+++ b/specs/templates/notifications.json
@@ -15,7 +15,7 @@
     }
   ],
   "paths": {
-    "/ocs/v1.php/apps/notifications/api/{apiVersion}/notifications": {
+    "/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications": {
       "parameters": [
         {
           "name": "apiVersion",
@@ -63,7 +63,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/{apiVersion}/notifications/{id}": {
+    "/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications/{id}": {
       "parameters": [
         {
           "name": "apiVersion",
@@ -119,7 +119,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/{apiVersion}/push": {
+    "/ocs/v2.php/apps/notifications/api/{apiVersion}/push": {
       "parameters": [
         {
           "name": "apiVersion",
@@ -193,7 +193,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/{apiVersion}/admin_notifications/{userId}": {
+    "/ocs/v2.php/apps/notifications/api/{apiVersion}/admin_notifications/{userId}": {
       "parameters": [
         {
           "name": "apiVersion",
@@ -250,7 +250,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/notifications/api/{apiVersion}/settings": {
+    "/ocs/v2.php/apps/notifications/api/{apiVersion}/settings": {
       "parameters": [
         {
           "name": "apiVersion",
diff --git a/specs/templates/provisioning_api.json b/specs/templates/provisioning_api.json
index fd54c85d..d783fa40 100644
--- a/specs/templates/provisioning_api.json
+++ b/specs/templates/provisioning_api.json
@@ -15,7 +15,7 @@
     }
   ],
   "paths": {
-    "/ocs/v1.php/apps/provisioning_api/apps": {
+    "/ocs/v2.php/apps/provisioning_api/apps": {
       "get": {
         "operationId": "apps-getapps-TODO",
         "tags": [
@@ -45,7 +45,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/apps/{app}": {
+    "/ocs/v2.php/apps/provisioning_api/apps/{app}": {
       "parameters": [
         {
           "name": "app",
@@ -111,7 +111,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/groups": {
+    "/ocs/v2.php/apps/provisioning_api/groups": {
       "get": {
         "operationId": "groups-getgroups-TODO",
         "tags": [
@@ -196,7 +196,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/groups/details": {
+    "/ocs/v2.php/apps/provisioning_api/groups/details": {
       "get": {
         "operationId": "groups-getgroupsdetails-TODO",
         "tags": [
@@ -244,7 +244,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/groups/{groupId}/users": {
+    "/ocs/v2.php/apps/provisioning_api/groups/{groupId}/users": {
       "parameters": [
         {
           "name": "groupId",
@@ -274,7 +274,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/groups/{groupId}/users/details": {
+    "/ocs/v2.php/apps/provisioning_api/groups/{groupId}/users/details": {
       "parameters": [
         {
           "name": "groupId",
@@ -332,7 +332,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/groups/{groupId}/subadmins": {
+    "/ocs/v2.php/apps/provisioning_api/groups/{groupId}/subadmins": {
       "parameters": [
         {
           "name": "groupId",
@@ -362,7 +362,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/groups/{groupId}": {
+    "/ocs/v2.php/apps/provisioning_api/groups/{groupId}": {
       "parameters": [
         {
           "name": "groupId",
@@ -446,7 +446,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users": {
+    "/ocs/v2.php/apps/provisioning_api/users": {
       "get": {
         "operationId": "users-getusers-TODO",
         "tags": [
@@ -583,7 +583,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/details": {
+    "/ocs/v2.php/apps/provisioning_api/users/details": {
       "get": {
         "operationId": "users-getusersdetails-TODO",
         "tags": [
@@ -631,7 +631,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/search/by-phone": {
+    "/ocs/v2.php/apps/provisioning_api/users/search/by-phone": {
       "post": {
         "operationId": "users-searchbyphonenumbers-TODO",
         "tags": [
@@ -669,7 +669,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -753,7 +753,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/user": {
+    "/ocs/v2.php/apps/provisioning_api/user": {
       "get": {
         "operationId": "users-getcurrentuser-TODO",
         "tags": [
@@ -773,7 +773,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/user/fields": {
+    "/ocs/v2.php/apps/provisioning_api/user/fields": {
       "get": {
         "operationId": "users-geteditablefields-TODO",
         "tags": [
@@ -793,7 +793,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/user/fields/{userId}": {
+    "/ocs/v2.php/apps/provisioning_api/user/fields/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -823,7 +823,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/{collectionName}": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/{collectionName}": {
       "parameters": [
         {
           "name": "userId",
@@ -879,7 +879,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/wipe": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/wipe": {
       "parameters": [
         {
           "name": "userId",
@@ -909,7 +909,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/enable": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/enable": {
       "parameters": [
         {
           "name": "userId",
@@ -939,7 +939,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/disable": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/disable": {
       "parameters": [
         {
           "name": "userId",
@@ -969,7 +969,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/groups": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/groups": {
       "parameters": [
         {
           "name": "userId",
@@ -1056,7 +1056,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/subadmins": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/subadmins": {
       "parameters": [
         {
           "name": "userId",
@@ -1142,7 +1142,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/users/{userId}/welcome": {
+    "/ocs/v2.php/apps/provisioning_api/users/{userId}/welcome": {
       "parameters": [
         {
           "name": "userId",
@@ -1172,7 +1172,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/api/v1/config/apps": {
+    "/ocs/v2.php/apps/provisioning_api/api/v1/config/apps": {
       "get": {
         "operationId": "appconfig-getapps-TODO",
         "tags": [
@@ -1192,7 +1192,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/api/v1/config/apps/{app}": {
+    "/ocs/v2.php/apps/provisioning_api/api/v1/config/apps/{app}": {
       "parameters": [
         {
           "name": "app",
@@ -1222,7 +1222,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/api/v1/config/apps/{app}/{key}": {
+    "/ocs/v2.php/apps/provisioning_api/api/v1/config/apps/{app}/{key}": {
       "parameters": [
         {
           "name": "app",
@@ -1317,7 +1317,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/api/v1/config/users/{appId}/{configKey}": {
+    "/ocs/v2.php/apps/provisioning_api/api/v1/config/users/{appId}/{configKey}": {
       "parameters": [
         {
           "name": "appId",
@@ -1383,7 +1383,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/provisioning_api/api/v1/config/users/{appId}": {
+    "/ocs/v2.php/apps/provisioning_api/api/v1/config/users/{appId}": {
       "parameters": [
         {
           "name": "appId",
diff --git a/specs/templates/user_status.json b/specs/templates/user_status.json
index e6528168..8121f4bd 100644
--- a/specs/templates/user_status.json
+++ b/specs/templates/user_status.json
@@ -15,7 +15,7 @@
     }
   ],
   "paths": {
-    "/ocs/v1.php/apps/user_status/api/v1/statuses": {
+    "/ocs/v2.php/apps/user_status/api/v1/statuses": {
       "get": {
         "operationId": "statuses-findall-TODO",
         "tags": [
@@ -53,7 +53,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/statuses/{userId}": {
+    "/ocs/v2.php/apps/user_status/api/v1/statuses/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -83,7 +83,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status": {
       "get": {
         "operationId": "userstatus-getstatus-TODO",
         "tags": [
@@ -103,7 +103,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/status": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/status": {
       "put": {
         "operationId": "userstatus-setstatus-TODO",
         "tags": [
@@ -133,7 +133,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message/predefined": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message/predefined": {
       "put": {
         "operationId": "userstatus-setpredefinedmessage-TODO",
         "tags": [
@@ -171,7 +171,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message/custom": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message/custom": {
       "put": {
         "operationId": "userstatus-setcustommessage-TODO",
         "tags": [
@@ -217,7 +217,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message": {
       "delete": {
         "operationId": "userstatus-clearmessage-TODO",
         "tags": [
@@ -237,7 +237,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/predefined_statuses": {
+    "/ocs/v2.php/apps/user_status/api/v1/predefined_statuses": {
       "get": {
         "operationId": "predefinedstatus-findall-TODO",
         "tags": [
@@ -257,7 +257,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/heartbeat": {
+    "/ocs/v2.php/apps/user_status/api/v1/heartbeat": {
       "put": {
         "operationId": "heartbeat-heartbeat-TODO",
         "tags": [
diff --git a/specs/user_status.json b/specs/user_status.json
index c5d9659d..9ff5fdf6 100644
--- a/specs/user_status.json
+++ b/specs/user_status.json
@@ -38,9 +38,7 @@
         "type": "object",
         "required": [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         "properties": {
           "status": {
@@ -324,7 +322,7 @@
     }
   },
   "paths": {
-    "/ocs/v1.php/apps/user_status/api/v1/statuses": {
+    "/ocs/v2.php/apps/user_status/api/v1/statuses": {
       "get": {
         "operationId": "find-all-statuses",
         "tags": [
@@ -344,7 +342,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/statuses/{userId}": {
+    "/ocs/v2.php/apps/user_status/api/v1/statuses/{userId}": {
       "parameters": [
         {
           "name": "userId",
@@ -374,7 +372,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status": {
       "get": {
         "operationId": "get-status",
         "tags": [
@@ -394,7 +392,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/status": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/status": {
       "put": {
         "operationId": "set-status",
         "tags": [
@@ -424,7 +422,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message/predefined": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message/predefined": {
       "put": {
         "operationId": "set-predefined-message",
         "tags": [
@@ -462,7 +460,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message/custom": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message/custom": {
       "put": {
         "operationId": "set-custom-message",
         "tags": [
@@ -508,7 +506,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/user_status/message": {
+    "/ocs/v2.php/apps/user_status/api/v1/user_status/message": {
       "delete": {
         "operationId": "clear-message",
         "tags": [
@@ -521,7 +519,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/predefined_statuses": {
+    "/ocs/v2.php/apps/user_status/api/v1/predefined_statuses": {
       "get": {
         "operationId": "find-all-predefined-statuses",
         "tags": [
@@ -541,7 +539,7 @@
         }
       }
     },
-    "/ocs/v1.php/apps/user_status/api/v1/heartbeat": {
+    "/ocs/v2.php/apps/user_status/api/v1/heartbeat": {
       "put": {
         "operationId": "heartbeat",
         "tags": [
diff --git a/tool/generate-nextcloud.sh b/tool/generate-nextcloud.sh
index 4734c327..046f59b8 100755
--- a/tool/generate-nextcloud.sh
+++ b/tool/generate-nextcloud.sh
@@ -73,9 +73,7 @@ for codename in ${codenames[*]}; do
         type: "object",
         required: [
           "status",
-          "statuscode",
-          "totalitems",
-          "itemsperpage"
+          "statuscode"
         ],
         properties: {
           status: {