diff --git a/packages/dynamite/build.yaml b/packages/dynamite/build.yaml
index 73fa6bce..7625766a 100644
--- a/packages/dynamite/build.yaml
+++ b/packages/dynamite/build.yaml
@@ -18,5 +18,5 @@ builders:
     build_extensions: {'.openapi.json': ['openapi.dart']}
     auto_apply: root_package
     build_to: source
-    runs_before: ["json_serializable"]
-    applies_builders: ["json_serializable"]
+    runs_before: ["built_value_generator|built_value"]
+    applies_builders: ["built_value_generator|built_value"]
diff --git a/packages/nextcloud/build.yaml b/packages/nextcloud/build.yaml
index b5d3d896..3d80b246 100644
--- a/packages/nextcloud/build.yaml
+++ b/packages/nextcloud/build.yaml
@@ -1,7 +1,5 @@
 targets:
   $default:
     builders:
-      json_serializable:
-        options:
-          disallow_unrecognized_keys: true
-          explicit_to_json: true
+      built_value_generator|built_value:
+        enabled: true
diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml
index 0d546526..18ac4f39 100644
--- a/packages/nextcloud/pubspec.yaml
+++ b/packages/nextcloud/pubspec.yaml
@@ -5,20 +5,21 @@ environment:
   sdk: '>=2.19.0 <3.0.0'
 
 dependencies:
+  built_collection: ^5.1.1
+  built_value: ^8.4.4
   cookie_jar: ^3.0.1
   crypto: ^3.0.2
   crypton: ^2.0.5
   intl: ^0.17.0
-  json_annotation: ^4.7.0
   version: ^3.0.2
   xml: ^6.1.0
 
 dev_dependencies:
   build_runner: ^2.2.1
+  built_value_generator: ^8.4.4
   coverage: ^1.6.1
   dynamite:
     path: ../dynamite
-  json_serializable: ^6.3.2
   nit_picking:
     git:
       url: https://github.com/stack11/dart_nit_picking