diff --git a/CHANGELOG.md b/CHANGELOG.md
index e36f88b5c..368d32eb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 ### Added
 - material transformation, fuel production (#1575)
 - life cycle assessment (#1576)
+- energy technology (#1591)
 
 ### Changed
 - production (#1575)
+- technology (#1591)
 
 ### Removed
 
diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
index e1348227d..02929c955 100644
--- a/src/ontology/edits/oeo-physical.omn
+++ b/src/ontology/edits/oeo-physical.omn
@@ -3541,16 +3541,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810"
     
 Class: OEO_00000407
 
-    Annotations: 
-        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-physical"^^xsd:string,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A Technology is an information content entity that specifies how to create an artificial object."@en,
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/136
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/334",
-        rdfs:label "technology"
-    
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/IAO_0000030>
-    
     
 Class: OEO_00000419
 
diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn
index 770d6251e..9a1e58c6c 100644
--- a/src/ontology/edits/oeo-shared.omn
+++ b/src/ontology/edits/oeo-shared.omn
@@ -13,8 +13,8 @@ Ontology: <http://openenergy-platform.org/ontology/oeo/oeo-shared/>
 Import: <http://openenergy-platform.org/ontology/oeo/dev/imports/iao-extracted.owl>
 Import: <http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl>
 Import: <http://openenergy-platform.org/ontology/oeo/dev/imports/uo-module.owl>
-Import: <https://raw.githubusercontent.com/BFO-ontology/BFO/v2.0/bfo.owl>
 Import: <http://purl.obolibrary.org/obo/omo.owl>
+Import: <https://raw.githubusercontent.com/BFO-ontology/BFO/v2.0/bfo.owl>
 
 Annotations: 
     dc:description "The Open Energy Ontology is an ontology for all aspects of the energy modelling domain. The \"Shared\" module covers all entities that are relevant for all our other modules. This includes shared imports like the BFO, IAO- and RO- module.",
@@ -2435,6 +2435,25 @@ https://github.com/OpenEnergyPlatform/ontology/pull/1463",
         OEO_00000149
     
     
+Class: OEO_00000407
+
+    Annotations: 
+        OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared"^^xsd:string,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A technology is a plan specification that describes how to combine artificial objects or other material entities and processes in a specific way."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/136
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/334
+moved to oeo-shared, change definition, reclassify, add axiom
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1572
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1591",
+        rdfs:label "technology"
+    
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/IAO_0000104>,
+        <http://purl.obolibrary.org/obo/IAO_0000136> some 
+            (OEO_00000061
+             and (<http://purl.obolibrary.org/obo/RO_0000056> some <http://purl.obolibrary.org/obo/BFO_0000015>))
+    
+    
 Class: OEO_00000419
 
     Annotations: 
@@ -3829,6 +3848,21 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1575"@en,
         OEO_00000419
     
     
+Class: OEO_00020267
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An energy technology is a technology that describes how to combine energy transformation units, energy transformations, energy carriers and energy in a specific way.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1572
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1591",
+        rdfs:label "energy technology"
+    
+    SubClassOf: 
+        OEO_00000407,
+        <http://purl.obolibrary.org/obo/IAO_0000136> some 
+            (OEO_00020102
+             and (<http://purl.obolibrary.org/obo/RO_0000056> some OEO_00020003))
+    
+    
 Class: OEO_00030002
 
     Annotations: