diff --git a/content/en/documentation/for-adopters/control-plane/_index.md b/content/en/documentation/for-adopters/control-plane/_index.md
index b1e83bd..3a8d8b0 100644
--- a/content/en/documentation/for-adopters/control-plane/_index.md
+++ b/content/en/documentation/for-adopters/control-plane/_index.md
@@ -150,9 +150,9 @@ An `Asset` is the primary building block for data sharing. An asset represents a
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@id": "899d1ad0-532a-47e8-2245-1aa3b2a4eac6",
   "properties": {
     "somePublicProp": "a very interesting value"
@@ -183,10 +183,12 @@ The `@context` property on an asset indicates that it is a JSON-LD type. JSON-LD
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "market-systems": "http://w3id.org/market-systems/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2",
+    {
+      "market-systems": "http://w3id.org/market-systems/v0.0.1/ns/"
+    }
+  ],
   "@id": "...",
   "properties": {
     "dataFeed": {
@@ -243,9 +245,9 @@ Policies are loaded into EDC via the Management API using a policy definition, w
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "PolicyDefinition",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
@@ -279,25 +281,25 @@ Now, let's examine a contract definition:
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
-  "@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
+  "@type": "ContractDefinition",
   "@id": "test-id",
-  "edc:accessPolicyId": "access-policy-1234",
-  "edc:contractPolicyId": "contract-policy-5678",
-  "edc:assetsSelector": [
+  "accessPolicyId": "access-policy-1234",
+  "contractPolicyId": "contract-policy-5678",
+  "assetsSelector": [
     {
-      "@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
-      "edc:operandLeft": "id",
-      "edc:operator": "in",
-      "edc:operandRight": ["id1", "id2", "id3"]
+      "@type": "Criterion",
+      "operandLeft": "id",
+      "operator": "in",
+      "operandRight": ["id1", "id2", "id3"]
     },
     {
-      "@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
-      "edc:operandLeft": "productCategory",
-      "edc:operator": "=",
-      "edc:operandRight": "gold"
+      "@type": "Criterion",
+      "operandLeft": "productCategory",
+      "operator": "=",
+      "operandRight": "gold"
     },
   ]
 }
@@ -329,25 +331,27 @@ If a negotiation is successfully completed (termed *finalized*), a DSP contract
 
 ```json
 {
-  "@context":  "https://w3id.org/dspace/2024/1/context.json",
-  "@type": "dspace:ContractAgreementMessage",
-  "dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-  "dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
-  "dspace:agreement": {
+  "@context":  [
+   "https://w3id.org/dspace/2024/1/context.json" 
+  ],
+  "@type": "ContractAgreementMessage",
+  "providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
+  "consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
+  "agreement": {
     "@id": "urn:uuid:e8dc8655-44c2-46ef-b701-4cffdc2faa44",
-    "@type": "odrl:Agreement",
-    "odrl:target": "urn:uuid:3dd1add4-4d2d-569e-d634-8394a8836d23",
-    "dspace:timestamp": "2023-01-01T01:00:00Z",
-    "odrl:permission": [{
-      "odrl:action": "odrl:use" ,
-      "odrl:constraint": [{
-        "odrl:leftOperand": "odrl:dateTime",
-        "odrl:operand": "odrl:lteq",
-        "odrl:rightOperand": { "@value": "2023-12-31T06:00Z", "@type": "xsd:dateTime" }
+    "@type": "Agreement",
+    "target": "urn:uuid:3dd1add4-4d2d-569e-d634-8394a8836d23",
+    "timestamp": "2023-01-01T01:00:00Z",
+    "permission": [{
+      "action": "odrl:use" ,
+      "constraint": [{
+        "leftOperand": "dateTime",
+        "operand": "lteq",
+        "rightOperand": "2023-12-31T06:00Z"
       }]
     }]
   },
-  "dspace:callbackAddress": "https://example.com/callback"
+  "callbackAddress": "https://example.com/callback"
 }
 ```
 
diff --git a/content/en/documentation/for-adopters/control-plane/policy-engine/_index.md b/content/en/documentation/for-adopters/control-plane/policy-engine/_index.md
index 2c77429..9535bb2 100644
--- a/content/en/documentation/for-adopters/control-plane/policy-engine/_index.md
+++ b/content/en/documentation/for-adopters/control-plane/policy-engine/_index.md
@@ -25,9 +25,9 @@ Let's take one of the previous policy examples:
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "PolicyDefinition",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
@@ -177,14 +177,13 @@ The following values are supported for the time unit:
 | d     | days         |
 
 A duration is defined in a `ContractDefinition` using the following policy and left-hand
-operands `https://w3id.org/edc/v0.0.1/ns/inForceDate`:
+operands `inForceDate`:
 
 ```json
 {
-  "@context": {
-    "cx": "https://w3id.org/cx/v0.8/",
-    "@vocab": "http://www.w3.org/ns/odrl.jsonld"
-  },
+  "@context": [
+      "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "Offer",
   "@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "permission": [
@@ -193,20 +192,14 @@ operands `https://w3id.org/edc/v0.0.1/ns/inForceDate`:
       "constraint": {
         "and": [
           {
-            "leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
+            "leftOperand": "inForceDate",
             "operator": "gt",
-            "rightOperand": {
-              "@value": "contractAgreement",
-              "@type": "https://w3id.org/edc/v0.0.1/ns/inForceDate:dateExpression"
-            }
+            "rightOperand": "contractAgreement"
           },
           {
-            "leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate:inForceDate",
+            "leftOperand": "inForceDate",
             "operator": "lt",
-            "rightOperand": {
-              "@value": "contractAgreement + 100d",
-              "@type": "https://w3id.org/edc/v0.0.1/ns/inForceDate:dateExpression"
-            }
+            "rightOperand": "contractAgreement + 100d"
           }
         ]
       }
@@ -217,14 +210,13 @@ operands `https://w3id.org/edc/v0.0.1/ns/inForceDate`:
 
 ### Fixed Date
 
-Fixed dates may also be specified as follows using `https://w3id.org/edc/v0.0.1/ns/inForceDate` operands:
+Fixed dates may also be specified as follows using `inForceDate` operands:
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
-    "@vocab": "http://www.w3.org/ns/odrl.jsonld"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "Offer",
   "@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "permission": [
@@ -233,20 +225,13 @@ Fixed dates may also be specified as follows using `https://w3id.org/edc/v0.0.1/
       "constraint": {
         "and": [
           {
-            "leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
+            "leftOperand": "inForceDate",
             "operator": "gt",
-            "rightOperand": {
-              "@value": "2023-01-01T00:00:01Z",
-              "@type": "xsd:datetime"
-            }
-          },
+            "rightOperand": "2023-01-01T00:00:01Z"
           {
-            "leftOperand": "https://w3id.org/edc/v0.0.1/ns/inForceDate",
+            "leftOperand": "inForceDate",
             "operator": "lt",
-            "rightOperand": {
-              "@value": "2024-01-01T00:00:01Z",
-              "@type": "xsd:datetime"
-            }
+            "rightOperand": "2024-01-01T00:00:01Z"
           }
         ]
       }
@@ -265,17 +250,16 @@ valid until its other constraints evaluate to false.
 
 ### Not Before and Until
 
-`Not Before` and `Until` semantics can be defined by specifying a single `https://w3id.org/edc/v0.0.1/ns/inForceDate`
+`Not Before` and `Until` semantics can be defined by specifying a single `inForceDate`
 fixed date constraint and an
 appropriate operand. For example, the following policy
 defines a contact is not in force before `January 1, 2023`:
 
  ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "@vocab": "http://www.w3.org/ns/odrl.jsonld"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "Offer",
   "@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "permission": [
@@ -298,6 +282,3 @@ defines a contact is not in force before `January 1, 2023`:
 
 - In-force policy with a fixed validity: [policy.inforce.fixed.json](./policy.inforce.fixed.json)
 - In-force policy with a relative validity duration: [policy.inforce.duration.json](./policy.inforce.duration.json)
-
-_Please note that the samples use the abbreviated prefix notation `"edc:inForceDate"` instead of the full namespace 
-`"https://w3id.org/edc/v0.0.1/ns/inForceDate"`._
diff --git a/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.duration.json b/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.duration.json
index d2243f7..86b2fb0 100644
--- a/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.duration.json
+++ b/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.duration.json
@@ -1,8 +1,7 @@
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "@vocab": "http://www.w3.org/ns/odrl.jsonld"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "Offer",
   "@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "permission": [
diff --git a/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.fixed.json b/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.fixed.json
index 8aa90bd..8495ba2 100644
--- a/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.fixed.json
+++ b/content/en/documentation/for-adopters/control-plane/policy-engine/policy.inforce.fixed.json
@@ -1,8 +1,7 @@
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "@vocab": "http://www.w3.org/ns/odrl.jsonld"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "Offer",
   "@id": "a343fcbf-99fc-4ce8-8e9b-148c97605aab",
   "permission": [
diff --git a/content/en/documentation/for-adopters/distributions-deployment-operations/_index.md b/content/en/documentation/for-adopters/distributions-deployment-operations/_index.md
index c838332..b314f69 100644
--- a/content/en/documentation/for-adopters/distributions-deployment-operations/_index.md
+++ b/content/en/documentation/for-adopters/distributions-deployment-operations/_index.md
@@ -121,23 +121,25 @@ Management domains are straightforward to configure as they mainly involve catal
 
 ```json
 {
-  "@context": "https://w3id.org/dspace/v0.8/context.json",
+  "@context": [
+    "https://w3id.org/dspace/2025/1/context.jsonld"
+  ],
   "@id": "urn:uuid:3afeadd8-ed2d-569e-d634-8394a8836d57",
-  "@type": "dcat:Catalog",
-  "dct:title": "Foo Industries Provider Root Catalog",
-  "dct:description": ["A catalog of catalogs"],
-  "dcat:catalog": {
-    "@type": "dcat:Catalog",
-    "dct:description": ["Foo Industries Sub-Catalog"],
-    "dcat:distribution": {
-      "@type": "dcat:Distribution",
-      "dcat:accessService": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77"
+  "@type": "Catalog",
+  "title": "Foo Industries Provider Root Catalog",
+  "description": ["A catalog of catalogs"],
+  "catalog": {
+    "@type": "Catalog",
+    "description": ["Foo Industries Sub-Catalog"],
+    "distribution": {
+      "@type": "Distribution",
+      "accessService": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77"
     },
-    "dcat:service": [
+    "service": [
       {
         "@id": "urn:uuid:4aa2dcc8-4d2d-569e-d634-8394a8834d77",
-        "@type": "dcat:DataService",
-        "dcat:endpointURL": "https://foo-industries.com/subcatalog"
+        "@type": "DataService",
+        "endpointURL": "https://foo-industries.com/subcatalog"
       }
     ]
   }
@@ -152,9 +154,9 @@ Datasets are created from assets. The same is true for linked catalogs. Adding t
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@id": "subcatalog-id",
   "@type": "CatalogAsset",
   "properties": {...},
@@ -171,19 +173,19 @@ The next step in creating a sub-catalog is to decide on access control, that is,
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
-  "@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
+  "@type": "ContractDefinition",
   "@id": "test-id",
-  "edc:accessPolicyId": "access-policy-1234",
-  "edc:contractPolicyId": "contract-policy-5678",
-  "edc:assetsSelector": [
+  "accessPolicyId": "access-policy-1234",
+  "contractPolicyId": "contract-policy-5678",
+  "assetsSelector": [
     {
-      "@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
-      "edc:operandLeft": "id",
-      "edc:operator": "in",
-      "edc:operandRight": ["subcatalog-id"]
+      "@type": "Criterion",
+      "operandLeft": "id",
+      "operator": "in",
+      "operandRight": ["subcatalog-id"]
     }
   ]
 }
@@ -193,19 +195,19 @@ Alternatively, the following contract definition example selects a group of sub-
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
-  "@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
+  "@type": "ContractDefinition",
   "@id": "test-id",
-  "edc:accessPolicyId": "group-access-policy-1234",
-  "edc:contractPolicyId": "contract-policy-5678",
-  "edc:assetsSelector": [
+  "accessPolicyId": "group-access-policy-1234",
+  "contractPolicyId": "contract-policy-5678",
+  "assetsSelector": [
     {
-      "@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
-      "edc:operandLeft": "region",
-      "edc:operator": "=",
-      "edc:operandRight": "EU"
+      "@type": "Criterion",
+      "operandLeft": "region",
+      "operator": "=",
+      "operandRight": "EU"
     }
   ]
 }
diff --git a/content/en/documentation/for-contributors/control-plane/entities/_index.md b/content/en/documentation/for-contributors/control-plane/entities/_index.md
index c180291..b21ad7d 100644
--- a/content/en/documentation/for-contributors/control-plane/entities/_index.md
+++ b/content/en/documentation/for-contributors/control-plane/entities/_index.md
@@ -49,9 +49,9 @@ A very simplistic `Asset` could look like this:
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@id": "79d9c360-476b-47e8-8925-0ffbeba5aec2",
   "properties": {
     "somePublicProp": "a very interesting value"
@@ -91,10 +91,12 @@ Here is an example of how an Asset with a custom property following a custom nam
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "sw": "http://w3id.org/starwars/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2",
+    {
+      "sw": "http://w3id.org/starwars/v0.0.1/ns/"
+    }
+  ],
   "@id": "79d9c360-476b-47e8-8925-0ffbeba5aec2",
   "properties": {
     "faction": "Galactic Imperium",
@@ -183,9 +185,9 @@ this:
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "PolicyDefinition",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
@@ -377,9 +379,9 @@ Let's revisit our headquarter policy from earlier and change it a little:
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "PolicyDefinition",
   "policy": {
     "@context": "http://www.w3.org/ns/odrl.jsonld",
@@ -434,9 +436,9 @@ Let's take this policy as example:
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "PolicyDefinition",
 	"@id": "2",
   "policy": {
@@ -460,9 +462,6 @@ Let's take this policy as example:
 }
 ```
 
-> Since we are using `@vocab`, the `leftOperand` `headquarter.location` value defaults to the `edc` namespace, i.e. will get transformed during JSON-LD expansion to `"https://w3id.org/edc/v0.0.1/ns/headquarter.location"`
-
-
 and let's assume that we didn't bind the policy to any function or scope, the output of the validation might look like this:
 
 ```json
@@ -473,11 +472,9 @@ and let's assume that we didn't bind the policy to any function or scope, the ou
     "leftOperand 'https://w3id.org/edc/v0.0.1/ns/headquarter.location' is not bound to any scopes: Rule { Permission constraints: [Or constraint: [Constraint 'https://w3id.org/edc/v0.0.1/ns/headquarter.location' EQ 'EU']] } ",
     "left operand 'https://w3id.org/edc/v0.0.1/ns/headquarter.location' is not bound to any functions: Rule { Permission constraints: [Or constraint: [Constraint 'https://w3id.org/edc/v0.0.1/ns/headquarter.location' EQ 'EU']] }"
   ],
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "odrl": "http://www.w3.org/ns/odrl/2/"
-  }
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ]
 }
 ```
 
@@ -499,12 +496,12 @@ In those scenarios, the new API called the "evaluation plan API" has been introd
 By using the same policy example, we could run an evaluation plan for the `contract.negotiation` scope:
 
 ```http request
-POST https://controlplane-host:port/management/v3.1alpha/policydefinitions/2/evaluationplan
+POST https://controlplane-host:port/management/v4/policydefinitions/2/evaluationplan
 Content-Type: application/json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "policyScope": "contract.negotiation"
 }
 ```
@@ -541,11 +538,9 @@ which gives this output:
   "prohibitionSteps": [],
   "obligationSteps": [],
   "postValidators": [],
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
-    "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "odrl": "http://www.w3.org/ns/odrl/2/"
-  }
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ]
 }
 ```
 
@@ -669,29 +664,29 @@ and `id3` that must contain the `"foo" : "bar"` property.
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
-  "@type": "https://w3id.org/edc/v0.0.1/ns/ContractDefinition",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
+  "@type": "ContractDefinition",
   "@id": "test-id",
-  "edc:accessPolicyId": "access-policy-1234",
-  "edc:contractPolicyId": "contract-policy-5678",
-  "edc:assetsSelector": [
+  "accessPolicyId": "access-policy-1234",
+  "contractPolicyId": "contract-policy-5678",
+  "assetsSelector": [
     {
-      "@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
-      "edc:operandLeft": "id",
-      "edc:operator": "in",
-      "edc:operandRight": [
+      "@type": "Criterion",
+      "operandLeft": "id",
+      "operator": "in",
+      "operandRight": [
         "id1",
         "id2",
         "id3"
       ]
     },
     {
-      "@type": "https://w3id.org/edc/v0.0.1/ns/Criterion",
-      "edc:operandLeft": "foo",
-      "edc:operator": "=",
-      "edc:operandRight": "bar"
+      "@type": "Criterion",
+      "operandLeft": "foo",
+      "operator": "=",
+      "operandRight": "bar"
     }
   ]
 }
@@ -734,9 +729,9 @@ management API.
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "ContractRequest",
   "counterPartyAddress": "http://provider-address",
   "protocol": "dataspace-protocol-http",
@@ -953,10 +948,10 @@ API:
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
-  "@type": "https://w3id.org/edc/v0.0.1/ns/TransferRequest",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
+  "@type": "TransferRequest",
   "protocol": "dataspace-protocol-http",
   "counterPartyAddress": "http://provider-address",
   "contractId": "contract-id",
@@ -1149,9 +1144,9 @@ Here's an example of how a `QuerySpec` object might look like when querying for
 
 ```json
 {
-  "@context": {
-    "edc": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "QuerySpec",
   "limit": 1,
   "offset": 1,
@@ -1201,9 +1196,9 @@ payload for filtering the datasets:
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "counterPartyAddress": "http://provider/api/dsp",
   "protocol": "dataspace-protocol-http",
   "counterPartyId": "providerId",
diff --git a/content/en/documentation/for-contributors/data-plane/_index.md b/content/en/documentation/for-contributors/data-plane/_index.md
index 7c42020..d044c76 100644
--- a/content/en/documentation/for-contributors/data-plane/_index.md
+++ b/content/en/documentation/for-contributors/data-plane/_index.md
@@ -377,7 +377,7 @@ On the provider side we can create an [Asset](../control-plane/entities.md#1-ass
 
 ```json
 {
-  "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
+  "@context": [ "https://w3id.org/edc/connector/management/v2" ],
   "@id": "file-asset",
   "properties": {
   },
@@ -416,9 +416,9 @@ Once a contract [agreement](../control-plane/entities.md#5-contract-agreements)
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
   "@type": "TransferRequest",
   "dataDestination": {
     "type": "Mail",
diff --git a/content/en/documentation/for-contributors/data-plane/custom-data-plane.md b/content/en/documentation/for-contributors/data-plane/custom-data-plane.md
index c1ee13c..a389c9b 100644
--- a/content/en/documentation/for-contributors/data-plane/custom-data-plane.md
+++ b/content/en/documentation/for-contributors/data-plane/custom-data-plane.md
@@ -53,9 +53,9 @@ request:
 POST https://controlplane-host:port/api/control/v1/dataplanes
 Content-Type: application/json
 {
-    "@context": {
-        "edc": "https://w3id.org/edc/v0.0.1/ns/"
-    },
+    "@context": [
+        "https://w3id.org/edc/connector/management/v2"
+    ],
     "@type": "DataPlaneInstance",
     "@id": "custom_dataplane",
     "url": "http://custom-dataplane-host:3000/dataflows",
@@ -156,9 +156,9 @@ The `sourceDataAddress` is the `DataAddress` configured in the [`Asset`](../cont
 
 ```json
 {
-    "@context": {
-        "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-    },
+    "@context": [
+        "https://w3id.org/edc/connector/management/v2"
+    ],
     "@id": "asset-1",
     "@type": "Asset",
     "dataAddress": {
@@ -173,9 +173,9 @@ The `destinationDataAddress` is derived from the `dataDestination` in the [`Tran
 
 ```json
 {
-    "@context": {
-        "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-    },
+    "@context": [
+        "https://w3id.org/edc/connector/management/v2"
+    ],
     "counterPartyAddress": "{{PROVIDER_DSP}}/api/dsp",
     "connectorId": "{{PROVIDER_ID}}",
     "contractId": "{{CONTRACT_ID}}",
@@ -195,9 +195,9 @@ A naive implementation may look like this:
 ```javascript
 async function handlePush(req, res) {
     res.send({
-        "@context": {
-            "edc": "https://w3id.org/edc/v0.0.1/ns/"
-        },
+        "@context": [
+            "https://w3id.org/edc/connector/management/v2"
+        ],
         "@type": "DataFlowResponseMessage"
     });
 
@@ -240,9 +240,9 @@ async function handlePull(req, res) {
     const { dataAddress } = await generateDataAddress(sourceDataAddress);
 
     const response = {
-        "@context": {
-            "edc": "https://w3id.org/edc/v0.0.1/ns/"
-        },
+        "@context": [
+            "https://w3id.org/edc/connector/management/v2"
+        ],
         "@type": "DataFlowResponseMessage",
         "dataAddress": dataAddress
     };
diff --git a/content/en/documentation/for-contributors/data-plane/data-plane-signaling/_index.md b/content/en/documentation/for-contributors/data-plane/data-plane-signaling/_index.md
index 6d214a5..8be4175 100644
--- a/content/en/documentation/for-contributors/data-plane/data-plane-signaling/_index.md
+++ b/content/en/documentation/for-contributors/data-plane/data-plane-signaling/_index.md
@@ -75,7 +75,7 @@ POST https://dataplane-host:port/api/signaling/v1/dataflows
 Content-Type: application/json
 
 {
-  "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
+  "@context": [ "https://w3id.org/edc/connector/management/v2" ],
   "@id": "transfer-id",
   "@type": "DataFlowStartMessage",
   "processId": "process-id",
@@ -113,7 +113,7 @@ POST https://dataplane-host:port/api/signaling/v1/dataflows
 Content-Type: application/json
 
 {
-  "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
+  "@context": [ "https://w3id.org/edc/connector/management/v2" ],
   "@type": "DataFlowSuspendMessage",
   "reason": "reason"
 }
@@ -130,7 +130,7 @@ POST https://dataplane-host:port/api/signaling/v1/dataflows
 Content-Type: application/json
 
 {
-  "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
+  "@context": [ "https://w3id.org/edc/connector/management/v2" ],
   "@type": "DataFlowTerminateMessage",
   "reason": "reason"
 }
diff --git a/content/en/documentation/for-contributors/runtime/json-ld.md b/content/en/documentation/for-contributors/runtime/json-ld.md
index bd0d44f..60bf383 100644
--- a/content/en/documentation/for-contributors/runtime/json-ld.md
+++ b/content/en/documentation/for-contributors/runtime/json-ld.md
@@ -167,10 +167,12 @@ The input JSON would look like this:
 
 ```json
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2",
+    {
     "sw": "http://w3id.org/starwars/v0.0.1/ns/"
-  },
+    }
+  ],
   "@type": "Asset",
   "@id": "79d9c360-476b-47e8-8925-0ffbeba5aec2",
   "properties": {
diff --git a/content/en/documentation/for-contributors/runtime/service-layers.md b/content/en/documentation/for-contributors/runtime/service-layers.md
index 936465c..28479c7 100644
--- a/content/en/documentation/for-contributors/runtime/service-layers.md
+++ b/content/en/documentation/for-contributors/runtime/service-layers.md
@@ -459,12 +459,12 @@ webhooks is only possible for certain events, for example when [initiating a con
 negotiation](https://eclipse-edc.github.io/Connector/openapi/management-api/#/Contract%20Negotiation%20V3/initiateContractNegotiationV3):
 
 ```json
-// POST /v3/contractnegotiations
+// POST /v4/contractnegotiations
 {
-  "@context": {
-    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
-  },
-  "@type": "https://w3id.org/edc/v0.0.1/ns/ContractRequest",
+  "@context": [
+    "https://w3id.org/edc/connector/management/v2"
+  ],
+  "@type": "ContractRequest",
   "counterPartyAddress": "http://provider-address",
   "protocol": "dataspace-protocol-http",
   "policy": {