diff --git a/data-models/untp-dia/artefacts/context.jsonld b/data-models/untp-dia/artefacts/context.jsonld
index d49e1221..2311c1dd 100644
--- a/data-models/untp-dia/artefacts/context.jsonld
+++ b/data-models/untp-dia/artefacts/context.jsonld
@@ -1,8 +1,8 @@
 {
   "@context": {
-    "untp-dia": "https://test.uncefact.org/vocabulary/untp/dia/0/",
-    "schemaorg": "https://schema.org/",
-    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/",
+    "untp-dia": "https://test.uncefact.org/vocabulary/untp/dia/working/",
+    "schema": "https://schema.org/",
+    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/",
     "renderMethodPrefix": "https://w3id.org/vc/render-method#",
     "xsd": "http://www.w3.org/2001/XMLSchema#",
     "@protected": true,
@@ -17,7 +17,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         }
       }
     },
@@ -31,7 +31,7 @@
           "@type": "xsd:string"
         },
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "schemeID": {
           "@id": "untp-core:schemeID",
@@ -49,7 +49,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "registeredId": {
           "@id": "untp-core:registeredId",
@@ -60,7 +60,7 @@
           "@type": "@id"
         },
         "description": {
-          "@id": "schemaorg:description"
+          "@id": "schema:description"
         },
         "registrationCountry": {
           "@id": "untp-core:registrationCountry",
@@ -84,7 +84,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -104,7 +104,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "issuerAlsoKnownAs": {
           "@id": "untp-core:Party",
@@ -112,7 +112,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -132,7 +132,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "registeredId": {
           "@id": "untp-dia:registeredId",
@@ -147,7 +147,7 @@
           "@type": "@vocab",
           "@context": {
             "@protected": true,
-            "@vocab": "https://test.uncefact.org/vocabulary/untp/dia/0/RegistryTypeCodeList#"
+            "@vocab": "https://test.uncefact.org/vocabulary/untp/dia/working/RegistryTypeCodeList#"
           }
         },
         "registrationScopeList": {
@@ -162,7 +162,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "mediaQuery": {
           "@id": "untp-core:mediaQuery",
@@ -184,7 +184,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "template": {
           "@id": "renderMethodPrefix:template",
diff --git a/data-models/untp-dia/artefacts/untp-dia-instance.json b/data-models/untp-dia/artefacts/untp-dia-instance.json
index 7359c695..a6822a61 100644
--- a/data-models/untp-dia/artefacts/untp-dia-instance.json
+++ b/data-models/untp-dia/artefacts/untp-dia-instance.json
@@ -5,7 +5,7 @@
   ],
   "@context": [
     "https://www.w3.org/ns/credentials/v2",
-    "https://test.uncefact.org/vocabulary/untp/dia/0.6.1/"
+    "https://test.uncefact.org/vocabulary/untp/dia/working/"
   ],
   "id": "https://example-company.com/credentials/2a423366-a0d6-4855-ba65-2e0c926d09b0",
   "issuer": {
diff --git a/data-models/untp-dia/artefacts/untp-dia-schema.json b/data-models/untp-dia/artefacts/untp-dia-schema.json
index e44627f2..adf1f4f5 100644
--- a/data-models/untp-dia/artefacts/untp-dia-schema.json
+++ b/data-models/untp-dia/artefacts/untp-dia-schema.json
@@ -31,7 +31,7 @@
     "@context": {
       "example": [
         "https://www.w3.org/ns/credentials/v2",
-        "https://test.uncefact.org/vocabulary/untp/dia/0.6.1/"
+        "https://test.uncefact.org/vocabulary/untp/dia/working/"
       ],
       "type": "array",
       "items": {
@@ -45,13 +45,13 @@
           "type": "string"
         },
         {
-          "const": "https://test.uncefact.org/vocabulary/untp/dia/0.6.1/",
+          "const": "https://test.uncefact.org/vocabulary/untp/dia/working/",
           "type": "string"
         }
       ],
       "default": [
         "https://www.w3.org/ns/credentials/v2",
-        "https://test.uncefact.org/vocabulary/untp/dia/0.6.1/"
+        "https://test.uncefact.org/vocabulary/untp/dia/working/"
       ],
       "minItems": 2,
       "uniqueItems": true
diff --git a/data-models/untp-dia/vocabulary.jsonld b/data-models/untp-dia/vocabulary.jsonld
index 1f5fdc54..5f44a698 100644
--- a/data-models/untp-dia/vocabulary.jsonld
+++ b/data-models/untp-dia/vocabulary.jsonld
@@ -1,12 +1,12 @@
 {
   "@context": {
-    "untp-dia": "https://test.uncefact.org/vocabulary/untp/dia/0/",
+    "untp-dia": "https://test.uncefact.org/vocabulary/untp/dia/working/",
     "xsd": "http://www.w3.org/2001/XMLSchema#",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "owl": "http://www.w3.org/2002/07/owl#",
     "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
     "schema": "https://schema.org/",
-    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/"
+    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/"
   },
   "@graph": [
     {
@@ -58,11 +58,11 @@
     {
       "@id": "untp-dia:name",
       "schema:rangeIncludes": {
-        "@id": "xsd:string"
+        "@id": "schema:name"
       },
       "@type": [
         "rdf:Property",
-        "owl:DatatypeProperty"
+        "owl:ObjectProperty"
       ],
       "schema:domainIncludes": [
         {