diff --git a/CHANGELOG.md b/CHANGELOG.md
index d52ecbdad..c82ad4987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.x.y] - 202x-xx-xx
+## [2.6.0] - 2024-12-06
 ### Added
 - has aggregation type, has time stamp alignment (#1944)
 - study descriptor (#1950)
@@ -29,7 +29,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - supply grid, transport network, critical infrastructure (#1947)
 - areal solar energy density (#1983)
 
-### Removed
 
 
 ## [2.5.0] - 2024-09-24
diff --git a/CITATION.cff b/CITATION.cff
index 08bd523c9..e7a890bdc 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -166,6 +166,6 @@ authors:
 title: "Open Energy Ontology (OEO)"
 type: software
 license: CC0-1.0
-version: 2.5.0
-date-released: 2024-09-24
+version: 2.6.0
+date-released: 2024-12-06
 url: "https://github.com/OpenEnergyPlatform/ontology"
diff --git a/VERSION b/VERSION
index 437459cd9..e70b4523a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn
index daa5ef622..db9156e03 100644
--- a/src/ontology/edits/oeo-model.omn
+++ b/src/ontology/edits/oeo-model.omn
@@ -3811,16 +3811,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1945",
         <http://purl.obolibrary.org/obo/BFO_0000023>
     
     
-Class: OEO_00400042
-
-    Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A technical model implementation is a generically dependent continuant that is part of a model and consists of the hardware and software realization of a (conceptual) model.",
-        <http://purl.obolibrary.org/obo/IAO_0000118> "model code",
-        <http://purl.obolibrary.org/obo/IAO_0000119> "https://www.researchgate.net/publication/264816512_Classifying_and_communicating_uncertainties_in_model-based_policy_analysis",
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1953
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1978",
-        rdfs:label "technical model implementation"@en
-
 Class: OEO_00400041
 
     Annotations: 
@@ -3829,13 +3819,26 @@ Class: OEO_00400041
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1951
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1977",
         rdfs:label "model system boundary"@en
-
     
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000031>,
         <http://purl.obolibrary.org/obo/BFO_0000050> some OEO_00000274
     
     
+Class: OEO_00400042
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A technical model implementation is a generically dependent continuant that is part of a model and consists of the hardware and software realization of a (conceptual) model.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "model code",
+        <http://purl.obolibrary.org/obo/IAO_0000119> "https://www.researchgate.net/publication/264816512_Classifying_and_communicating_uncertainties_in_model-based_policy_analysis",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1953
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1978",
+        rdfs:label "technical model implementation"@en
+    
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000031>
+    
+    
 Individual: OEO_00000049
 
     Annotations: 
diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
index b44374e50..00b7808ce 100644
--- a/src/ontology/edits/oeo-physical.omn
+++ b/src/ontology/edits/oeo-physical.omn
@@ -6252,7 +6252,7 @@ Class: OEO_00010138
     Annotations: 
         OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/863
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/911",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "Carbon capture is a process that captures carbon dioxide from a gas. test",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Carbon capture is a process that captures carbon dioxide from a gas.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "CO2-Abscheidung"@de,
         rdfs:label "carbon capture"@en
     
diff --git a/src/ontology/edits/oeo-tasks.omn b/src/ontology/edits/oeo-tasks.omn
index 3f5ba25b5..cd154ca02 100644
--- a/src/ontology/edits/oeo-tasks.omn
+++ b/src/ontology/edits/oeo-tasks.omn
@@ -712,8 +712,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940",
     
     SubClassOf: 
         OEO_00020166,
-        (<http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00390059)
-         and (<http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00390060),
         <http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00390061