diff --git a/airQuality/jsonld-contexts/airQuality-compound.jsonld b/airQuality/jsonld-contexts/airQuality-compound.jsonld
index 44b4243..91112ea 100644
--- a/airQuality/jsonld-contexts/airQuality-compound.jsonld
+++ b/airQuality/jsonld-contexts/airQuality-compound.jsonld
@@ -1,7 +1,6 @@
 {
     "@context": [
         "https://easy-global-market.github.io/ngsild-api-data-models/airQuality/jsonld-contexts/airQuality.jsonld",
-        "https://easy-global-market.github.io/ngsild-api-data-models/device/jsonld-contexts/device.jsonld",
-        "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
+        "https://easy-global-market.github.io/ngsild-api-data-models/twinPicks/jsonld-contexts/twinPicks-compound.jsonld"
     ]
 }
diff --git a/irrigation/jsonld-contexts/irrigation-compound.jsonld b/irrigation/jsonld-contexts/irrigation-compound.jsonld
index 14aa2e7..b0ee218 100644
--- a/irrigation/jsonld-contexts/irrigation-compound.jsonld
+++ b/irrigation/jsonld-contexts/irrigation-compound.jsonld
@@ -2,12 +2,8 @@
     "@context": [
         "https://easy-global-market.github.io/ngsild-api-data-models/irrigation/jsonld-contexts/irrigation.jsonld",
         "https://easy-global-market.github.io/ngsild-api-data-models/device/jsonld-contexts/edgespot.jsonld",
-        "https://easy-global-market.github.io/ngsild-api-data-models/device/jsonld-contexts/device.jsonld",
         "https://easy-global-market.github.io/ngsild-api-data-models/environment/jsonld-contexts/environment.jsonld",
         "https://easy-global-market.github.io/ngsild-api-data-models/weather/jsonld-contexts/weather.jsonld",
-        "https://easy-global-market.github.io/ngsild-api-data-models/alertEventRisk/jsonld-contexts/alertEventRisk.jsonld",
-        "https://easy-global-market.github.io/ngsild-api-data-models/authorization/jsonld-contexts/authorization.jsonld",
-        "https://easy-global-market.github.io/ngsild-api-data-models/mapping/jsonld-contexts/mapping.jsonld",
-        "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
+        "https://easy-global-market.github.io/ngsild-api-data-models/twinPicks/jsonld-contexts/twinPicks-compound.jsonld"
     ]
 }
diff --git a/twinPicks/jsonld-contexts/twinPicks-compound.jsonld b/twinPicks/jsonld-contexts/twinPicks-compound.jsonld
index cd4f107..6f1361b 100644
--- a/twinPicks/jsonld-contexts/twinPicks-compound.jsonld
+++ b/twinPicks/jsonld-contexts/twinPicks-compound.jsonld
@@ -1,11 +1,14 @@
 {
   "@context": [
-    "https://easy-global-market.github.io/ngsild-api-data-models/dcat/jsonld-contexts/dcat-compound.jsonld",
+    "https://easy-global-market.github.io/c2jn-data-models/jsonld-contexts/datacenter-equipments.jsonld",
+    "https://easy-global-market.github.io/ngsild-api-data-models/dcat/jsonld-contexts/dcat.jsonld",
+    "https://easy-global-market.github.io/c2jn-data-models/jsonld-contexts/c2jn-smart-city-compound.jsonld",
     "https://easy-global-market.github.io/ngsild-api-data-models/twinPicks/jsonld-contexts/usecase.jsonld",
+    "https://easy-global-market.github.io/ngsild-api-data-models/device/jsonld-contexts/device.jsonld",
     "https://easy-global-market.github.io/ngsild-api-data-models/alertEventRisk/jsonld-contexts/alertEventRisk.jsonld",
     "https://easy-global-market.github.io/ngsild-api-data-models/authorization/jsonld-contexts/authorization.jsonld",
     "https://easy-global-market.github.io/ngsild-api-data-models/mapping/jsonld-contexts/flowMapping.jsonld",
     "https://easy-global-market.github.io/ngsild-api-data-models/mapping/jsonld-contexts/mapping.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
   ]
 }