diff --git a/tests/input/semdata.yaml b/tests/input/semdata.yaml
index 48f76e54..33b7cc59 100644
--- a/tests/input/semdata.yaml
+++ b/tests/input/semdata.yaml
@@ -26,7 +26,7 @@ Dataset:
       hasEmail: <Sigurd.Wenner@sintef.no>
     inSeries: semdata:SEM_cement_batch2/77600-23-001
 
-    datamodel: http://onto-ns.com/meta/matchmaker/0.2/SEMImage
+    "@datamodel": http://onto-ns.com/meta/matchmaker/0.2/SEMImage
     #datamodel: http://onto-ns.com/meta/characterisation/0.2/SEMImage
     datamodelStorage: https://github.com/HEU-MatCHMaker/DataDocumentation/blob/master/SEM/datamodels/SEMImage.yaml
     #mappingURL: https://raw.githubusercontent.com/HEU-MatCHMaker/DataDocumentation/refs/heads/master/SEM/datamodels/SEMImage.ttl
diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py
index d63986ff..6a4f22ce 100644
--- a/tripper/datadoc/dataset.py
+++ b/tripper/datadoc/dataset.py
@@ -360,7 +360,7 @@ def _deduplicate_types(d):
                 for i, spo in enumerate(descr[k])
             ]
             add(d, k, [tuple(t) for t in lst])
-        elif k == "datamodel":
+        elif k == "@datamodel":
             add(d, "@type", v)
             d[k] = v
         #
@@ -867,9 +867,9 @@ def save_extra_content(ts: Triplestore, source: dict) -> None:
 
     # Save data models
     datamodels = {
-        d["@id"]: d["datamodel"]
+        d["@id"]: d["@datamodel"]
         for d in source.get("Dataset", ())
-        if "datamodel" in d
+        if "@datamodel" in d
     }
     try:
         # pylint: disable=import-outside-toplevel
@@ -1455,7 +1455,7 @@ def get_partial_pipeline(
 
         conf = gen.get("configuration")
         if gen.generatorType == "application/vnd.dlite-generate":
-            conf.setdefault("datamodel", dct.get("datamodel"))
+            conf.setdefault("@datamodel", dct.get("@datamodel"))
 
         function = client.create_function(
             functionType=gen.generatorType,