diff --git a/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala b/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala
index 8ce4ba9..c28a77a 100644
--- a/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala
+++ b/exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala
@@ -22,7 +22,7 @@ class VocabularyPropertiesTest extends AsyncFunSuite with VocabularyTest {
   }
 
   test("Vocabularies parsing aml_meta") {
-    testVocabulary(aml_meta, 25, 38)
+    testVocabulary(aml_meta, 26, 38)
   }
 
   test("Vocabularies parsing api_contract") {
diff --git a/transform/dependencies.properties b/transform/dependencies.properties
index 8ea8628..bf5a5d7 100644
--- a/transform/dependencies.properties
+++ b/transform/dependencies.properties
@@ -1,4 +1,4 @@
 # Leave here for the publication process to detect if amf-transform has to be published!
 # Because we publish a version of amf-transform for each version of amf-client publish.
-amf.apicontract=5.0.5
-amf.rdf=6.0.5
\ No newline at end of file
+amf.apicontract=5.0.6
+amf.rdf=6.0.6
diff --git a/versions.yaml b/versions.yaml
index 3bf4eed..938af32 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1,2 +1,2 @@
-amf.vocabulary: 21.0.0
-amf.transform: 2.5.0
\ No newline at end of file
+amf.vocabulary: 22.0.0
+amf.transform: 2.6.0
diff --git a/vocabulary/src/main/resources/vocabularies/aml_meta.yaml b/vocabulary/src/main/resources/vocabularies/aml_meta.yaml
index 4085245..9ac6e9b 100644
--- a/vocabulary/src/main/resources/vocabularies/aml_meta.yaml
+++ b/vocabulary/src/main/resources/vocabularies/aml_meta.yaml
@@ -7,9 +7,15 @@ uses:
   doc: aml_doc.yaml
   owl: external/owl.yaml
 classTerms:
+  AnyMapping:
+    displayName: AnyMapping
+    description: Base class for all mappings stored in the AML graph model
+    extends: shacl.Shape
   ConditionalNodeMapping:
     displayName: ConditionalNodeMapping
-    extends: shacl.Shape
+    extends:
+      - shacl.Shape
+      - AnyMapping
   ContextBaseIri:
     displayName: baseIRIModel
     description: Encodes information about the base document IRI for the model element @ids
@@ -83,7 +89,9 @@ classTerms:
     displayName: NodeAnnotationMapping
   NodeMapping:
     displayName: NodeMapping
-    extends: shacl.Shape
+    extends:
+      - shacl.Shape
+      - AnyMapping
   NodePropertyMapping:
     displayName: NodePropertyMapping
     description: Semantic mapping from an input AST in a dialect document to the output graph of information for a class of output node
@@ -97,7 +105,9 @@ classTerms:
     description: Set of semantic contextual information that can be attached to a schema
   UnionNodeMapping:
     displayName: UnionNodeMapping
-    extends: shacl.Shape
+    extends:
+      - shacl.Shape
+      - AnyMapping
   Vocabulary:
     displayName: Vocabulary
     description: Basic primitives for the declaration of vocabularies.