diff --git a/src/metaschema.json b/src/metaschema.json
index 1444e77a78..55f5ad1e14 100644
--- a/src/metaschema.json
+++ b/src/metaschema.json
@@ -82,7 +82,7 @@
           "patternProperties": {
             "^[a-zA-Z0-9_]+$": {
               "allOf": [
-                { "$ref": "#/definitions/termTypes/JSONSchema" },
+                { "$ref": "https://json-schema.org/draft/2020-12/schema#" },
                 { "$ref": "#/definitions/termTypes/general" },
                 { "$ref": "#/definitions/termTypes/nameValue" },
                 {
@@ -92,7 +92,12 @@
                     "format": { "$ref": "#/definitions/enums/formats" },
                     "unit": { "type": "string" }
                   }
-                }
+		}
+	      ],
+              "anyOf": [
+                { "required": ["type"] },
+                { "required": ["anyOf"] },
+                { "required": ["definition"] }
               ],
               "unevaluatedProperties": false
             }