diff --git a/containers/azimuth/context/organ-metadata.json b/containers/azimuth/context/organ-metadata.json
index 833f834..72d0671 100644
--- a/containers/azimuth/context/organ-metadata.json
+++ b/containers/azimuth/context/organ-metadata.json
@@ -4,26 +4,14 @@
     "organ_level": "Kidney_L3",
     "prediction_column": "annotation.l3"
   },
-  "UBERON:0004538": {
-    "model": "kidneyref",
-    "organ_level": "Kidney_L3",
-    "prediction_column": "annotation.l3"
-  },
-  "UBERON:0004539": {
-    "model": "kidneyref",
-    "organ_level": "Kidney_L3",
-    "prediction_column": "annotation.l3"
-  },
+  "UBERON:0004538": "UBERON:0002113",
+  "UBERON:0004539": "UBERON:0002113",
   "UBERON:0002048": {
     "model": "lungref",
     "organ_level": "Lung_v2_finest_level",
     "prediction_column": "ann_finest_level"
   },
-  "UBERON:0001004": {
-    "model": "lungref",
-    "organ_level": "Lung_v2_finest_level",
-    "prediction_column": "ann_finest_level"
-  },
+  "UBERON:0001004": "UBERON:0002048",
   "UBERON:0000948": {
     "model": "heartref",
     "organ_level": "Heart_L2",
diff --git a/containers/celltypist/context/organ-metadata.json b/containers/celltypist/context/organ-metadata.json
index db07d6d..3704c12 100644
--- a/containers/celltypist/context/organ-metadata.json
+++ b/containers/celltypist/context/organ-metadata.json
@@ -2,9 +2,7 @@
   "UBERON:0002048": {
     "model": "Human_Lung_Atlas.pkl"
   },
-  "UBERON:0001004": {
-    "model": "Human_Lung_Atlas.pkl"
-  },
+  "UBERON:0001004": "UBERON:0002048",
   "UBERON:0002097": {
     "model": "Adult_Human_Skin.pkl"
   },
diff --git a/containers/popv/context/organ-metadata.json b/containers/popv/context/organ-metadata.json
index a171b86..8ff0609 100644
--- a/containers/popv/context/organ-metadata.json
+++ b/containers/popv/context/organ-metadata.json
@@ -15,14 +15,8 @@
     "model": "Eye",
     "organ_level": "eye"
   },
-  "UBERON:0004548": {
-    "model": "Eye",
-    "organ_level": "eye"
-  },
-  "UBERON:0004549": {
-    "model": "Eye",
-    "organ_level": "eye"
-  },
+  "UBERON:0004548": "UBERON:0000970",
+  "UBERON:0004549": "UBERON:0000970",
   "UBERON:0000948": {
     "model": "Heart",
     "organ_level": "heart"