diff --git a/invenio_records_marc21/records/mappings/os-v2/marc21records/drafts/marc21-v2.0.0.json b/invenio_records_marc21/records/mappings/os-v2/marc21records/drafts/marc21-v2.0.0.json
index 070f87e6..18a6b5b5 100644
--- a/invenio_records_marc21/records/mappings/os-v2/marc21records/drafts/marc21-v2.0.0.json
+++ b/invenio_records_marc21/records/mappings/os-v2/marc21records/drafts/marc21-v2.0.0.json
@@ -52,16 +52,6 @@
             }
           }
         }
-      },
-      {
-        "metadata_field": {
-          "path_match": "metadata.fields.*",
-          "match_mapping_type": "object",
-          "mapping": {
-            "index": false,
-            "type": "object"
-          }
-        }
       }
     ],
     "date_detection": false,
@@ -244,6 +234,7 @@
         "type": "boolean"
       },
       "metadata": {
+        "dynamic": false,
         "properties": {
           "fields": {
             "properties": {
diff --git a/invenio_records_marc21/records/mappings/os-v2/marc21records/marc21/marc21-v2.0.0.json b/invenio_records_marc21/records/mappings/os-v2/marc21records/marc21/marc21-v2.0.0.json
index d8330ce8..7f93a083 100644
--- a/invenio_records_marc21/records/mappings/os-v2/marc21records/marc21/marc21-v2.0.0.json
+++ b/invenio_records_marc21/records/mappings/os-v2/marc21records/marc21/marc21-v2.0.0.json
@@ -52,16 +52,6 @@
             }
           }
         }
-      },
-      {
-        "metadata_field": {
-          "path_match": "metadata.fields.*",
-          "match_mapping_type": "object",
-          "mapping": {
-            "index": false,
-            "type": "object"
-          }
-        }
       }
     ],
     "date_detection": false,
@@ -244,6 +234,7 @@
         "type": "boolean"
       },
       "metadata": {
+        "dynamic": false,
         "properties": {
           "fields": {
             "properties": {