diff --git a/data-flow-diagram.html b/data-flow-diagram.html
index 101dcfdd..c5bc1345 100644
--- a/data-flow-diagram.html
+++ b/data-flow-diagram.html
@@ -222,9 +222,10 @@ visualisation.</p>
     EMQ[EMQX]
     MOS[Mosquitto]
     BUN[BunkerM]
+    FRO[FROST-Server]
     ORI[Orion-LD]
     STE[Stellio]
-    FRO[FROST-Server]
+    UI[OpenRemote UI]
     ORM[OpenRemote Manager]
     KC[Keycloak]
     INF[InfluxDB]
@@ -232,7 +233,6 @@ visualisation.</p>
     GEO[GeoServer]
     GRA[Grafana]
     MAP[MapStore]
-    UI[OpenRemote UI]
 
     SIM --&gt; EMQ
     SIM --&gt; MOS
@@ -253,7 +253,7 @@ visualisation.</p>
     BUN --&gt;|via BunkerM| STE
     BUN --&gt;|via BunkerM| FRO
     BUN --&gt; ORM
-    ORM --&gt; UI
+    UI --&gt; ORM
     ORM -.-&gt; KC
     SIM --&gt; INF
     ORI --&gt; GRA
diff --git a/data-flow-diagram.md b/data-flow-diagram.md
index e7d7bbde..6e7eea1e 100644
--- a/data-flow-diagram.md
+++ b/data-flow-diagram.md
@@ -15,9 +15,10 @@ graph TB
     EMQ[EMQX]
     MOS[Mosquitto]
     BUN[BunkerM]
+    FRO[FROST-Server]
     ORI[Orion-LD]
     STE[Stellio]
-    FRO[FROST-Server]
+    UI[OpenRemote UI]
     ORM[OpenRemote Manager]
     KC[Keycloak]
     INF[InfluxDB]
@@ -25,7 +26,6 @@ graph TB
     GEO[GeoServer]
     GRA[Grafana]
     MAP[MapStore]
-    UI[OpenRemote UI]
 
     SIM --> EMQ
     SIM --> MOS
@@ -46,7 +46,7 @@ graph TB
     BUN -->|via BunkerM| STE
     BUN -->|via BunkerM| FRO
     BUN --> ORM
-    ORM --> UI
+    UI --> ORM
     ORM -.-> KC
     SIM --> INF
     ORI --> GRA