diff --git a/composer.json b/composer.json
index 0453437..7b3d6f7 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "netgen/openapi": "^1.0",
+        "netgen/openapi": "^1.0.2",
         "netgen/layouts-core": "^1.4.11",
         "netgen/layouts-ibexa": "^1.4",
         "netgen/ibexa-site-api": "^6.2"
diff --git a/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/MatrixFieldValueSchemaProvider.php b/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/MatrixFieldValueSchemaProvider.php
index cc23d14..cfbfeca 100644
--- a/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/MatrixFieldValueSchemaProvider.php
+++ b/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/MatrixFieldValueSchemaProvider.php
@@ -12,12 +12,11 @@ public function provideFieldValueSchema(): Schema
     {
         return new Schema\ArraySchema(
             new Schema\ObjectSchema(
-                [
-                    'type' => new Schema\StringSchema(),
-                    'value' => new Schema\StringSchema(),
-                ],
                 null,
-                ['type', 'value'],
+                null,
+                null,
+                null,
+                new Schema\StringSchema(),
             ),
         );
     }
diff --git a/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/RemoteMediaFieldValueSchemaProvider.php b/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/RemoteMediaFieldValueSchemaProvider.php
index c7f982f..7bb7ed4 100644
--- a/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/RemoteMediaFieldValueSchemaProvider.php
+++ b/lib/OpenApi/SchemaProvider/Ibexa/FieldValue/RemoteMediaFieldValueSchemaProvider.php
@@ -27,7 +27,7 @@ public function provideFieldValueSchema(): Schema
             'altText' => new Schema\OneOfSchema([new Schema\StringSchema(), new Schema\NullSchema()]),
             'caption' => new Schema\OneOfSchema([new Schema\StringSchema(), new Schema\NullSchema()]),
             'tags' => new Schema\ArraySchema(new Schema\StringSchema()),
-            'metadata' => new Schema\OneOfSchema([new Schema\ObjectSchema(), new Schema\NullSchema()]),
+            'metadata' => new Schema\OneOfSchema([new Schema\ObjectSchema(null, null, null, null, true), new Schema\NullSchema()]),
             'context' => new Schema\OneOfSchema([new Schema\ObjectSchema(), new Schema\NullSchema()]),
             'locationId' => new Schema\OneOfSchema([new Schema\IntegerSchema(), new Schema\NullSchema()]),
             'locationSource' => new Schema\OneOfSchema([new Schema\StringSchema(), new Schema\NullSchema()]),