diff --git a/docker-compose/technical/grafana/dashboards/stateestimation_orchestrator_metrics.json b/docker-compose/technical/grafana/dashboards/stateestimation_orchestrator_metrics.json
index cb7563be..351af4d7 100644
--- a/docker-compose/technical/grafana/dashboards/stateestimation_orchestrator_metrics.json
+++ b/docker-compose/technical/grafana/dashboards/stateestimation_orchestrator_metrics.json
@@ -272,7 +272,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": true,
-          "expr": "stateestimation_orchestrator_network_store_seconds_max",
+          "expr": "stateestimation_orchestrator_create_network_seconds_max",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -290,7 +290,7 @@
           "visible": true
         }
       ],
-      "title": "Store network in database",
+      "title": "Create network",
       "type": "timeseries"
     },
     {
@@ -490,7 +490,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": true,
-          "expr": "stateestimation_orchestrator_network_load_seconds_max",
+          "expr": "stateestimation_orchestrator_stateestimation_run_seconds_max",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -508,7 +508,7 @@
           "visible": true
         }
       ],
-      "title": "Load network from database",
+      "title": "State estimation",
       "type": "timeseries"
     },
     {
@@ -599,7 +599,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": true,
-          "expr": "stateestimation_orchestrator_stateestimation_run_seconds_max",
+          "expr": "stateestimation_orchestrator_loadflow_run_seconds_max",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -617,7 +617,7 @@
           "visible": true
         }
       ],
-      "title": "State estimation",
+      "title": "Loadflow",
       "type": "timeseries"
     },
     {
@@ -708,7 +708,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": true,
-          "expr": "stateestimation_orchestrator_loadflow_run_seconds_max",
+          "expr": "stateestimation_orchestrator_network_export_seconds_max",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -726,7 +726,7 @@
           "visible": true
         }
       ],
-      "title": "Loadflow",
+      "title": "Export network to BIIDM format output file",
       "type": "timeseries"
     },
     {
@@ -817,7 +817,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": true,
-          "expr": "stateestimation_orchestrator_network_flush_seconds_max",
+          "expr": "stateestimation_orchestrator_output_case_import_seconds_max",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -835,7 +835,7 @@
           "visible": true
         }
       ],
-      "title": "Flush network to database",
+      "title": "Store output file in case-server",
       "type": "timeseries"
     },
     {
@@ -917,224 +917,6 @@
           "sort": "none"
         }
       },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "exemplar": true,
-          "expr": "stateestimation_orchestrator_network_export_seconds_max",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "interval": "",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "op": "gt",
-          "value": 0,
-          "visible": true
-        }
-      ],
-      "title": "Export network to BIIDM format output file",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 16,
-        "y": 16
-      },
-      "id": 10,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "exemplar": true,
-          "expr": "stateestimation_orchestrator_output_case_import_seconds_max",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "interval": "",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "op": "gt",
-          "value": 0,
-          "visible": true
-        }
-      ],
-      "title": "Store output file in case-server",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 0,
-        "y": 24
-      },
-      "id": 11,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
       "targets": [
         {
           "datasource": {