diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index 399d3a248414955d2bfbd1a67a4082cadd0c22d6..fd8625cf2563280e8e6a8ff7a714a03a8622a473 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -486,11 +486,11 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then
     curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
     echo
 
-    # Dashboard: Device ConfigureDevice Details
-    curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_config_exec_details.json' \
+    # Dashboard: Device Execution Details
+    curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_exec_details.json' \
         ${GRAFANA_URL_UPDATED}/api/dashboards/db
     echo
-    DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-confdev"
+    DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-exec"
     DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id')
     curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
     echo
diff --git a/src/webui/grafana_prom_device_exec_details.json b/src/webui/grafana_prom_device_exec_details.json
index 5e9e9f28a331c5afbaa733c2e76a7a8655ebc6d1..a18c2b91cabd942dd5908ff3e6b3966528e62fa0 100644
--- a/src/webui/grafana_prom_device_exec_details.json
+++ b/src/webui/grafana_prom_device_exec_details.json
@@ -25,8 +25,8 @@
     "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
-    "id": 6,
-    "iteration": 1682697941785,
+    "id": null,
+    "iteration": 1683036452435,
     "links": [],
     "liveNow": false,
     "panels": [
@@ -43,7 +43,7 @@
         "dataFormat": "tsbuckets",
         "datasource": {
           "type": "prometheus",
-          "uid": "b1BgiIsVz"
+          "uid": "prometheus"
         },
         "gridPos": {
           "h": 22,
@@ -65,15 +65,17 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "b1BgiIsVz"
+              "uid": "prometheus"
             },
+            "editorMode": "code",
             "exemplar": true,
-            "expr": "sum(\r\n    max_over_time(tfs_device_exec_details_[[method]]_histogram_duration_bucket{pod=~\"[[pod]]\", step=~\"[[step]]\"}[1m]) -\r\n    min_over_time(tfs_device_exec_details_[[method]]_histogram_duration_bucket{pod=~\"[[pod]]\", step=~\"[[step]]\"}[1m])\r\n) by (le)",
+            "expr": "sum(\r\n    max_over_time(tfs_device_execution_details_histogram_duration_bucket{driver=~\"[[driver]]\", operation=~\"[[operation]]\", step=~\"[[step]]\"}[1m]) -\r\n    min_over_time(tfs_device_execution_details_histogram_duration_bucket{driver=~\"[[driver]]\", operation=~\"[[operation]]\", step=~\"[[step]]\"}[1m])\r\n) by (le)",
             "format": "heatmap",
             "instant": false,
             "interval": "1m",
             "intervalFactor": 1,
             "legendFormat": "{{le}}",
+            "range": true,
             "refId": "A"
           }
         ],
@@ -94,7 +96,7 @@
         "yBucketBound": "auto"
       }
     ],
-    "refresh": "",
+    "refresh": "5s",
     "schemaVersion": 36,
     "style": "dark",
     "tags": [],
@@ -113,17 +115,52 @@
           },
           "datasource": {
             "type": "prometheus",
-            "uid": "b1BgiIsVz"
+            "uid": "prometheus"
           },
-          "definition": "label_values(tfs_device_execution_details_histogram_duration_bucket, pod)",
+          "definition": "label_values(tfs_device_execution_details_histogram_duration_bucket, operation)",
           "hide": 0,
           "includeAll": true,
-          "label": "Pod",
+          "label": "Operation",
           "multi": true,
-          "name": "pod",
+          "name": "operation",
           "options": [],
           "query": {
-            "query": "label_values(tfs_device_execution_details_histogram_duration_bucket, pod)",
+            "query": "label_values(tfs_device_execution_details_histogram_duration_bucket, operation)",
+            "refId": "StandardVariableQuery"
+          },
+          "refresh": 2,
+          "regex": "",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": ".*",
+          "current": {
+            "selected": true,
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
+          },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "definition": "label_values(tfs_device_execution_details_histogram_duration_bucket, driver)",
+          "hide": 0,
+          "includeAll": true,
+          "label": "Driver",
+          "multi": true,
+          "name": "driver",
+          "options": [],
+          "query": {
+            "query": "label_values(tfs_device_execution_details_histogram_duration_bucket, driver)",
             "refId": "StandardVariableQuery"
           },
           "refresh": 2,
@@ -138,13 +175,17 @@
         {
           "allValue": ".*",
           "current": {
-            "selected": false,
-            "text": "All",
-            "value": "$__all"
+            "selected": true,
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
           },
           "datasource": {
             "type": "prometheus",
-            "uid": "b1BgiIsVz"
+            "uid": "prometheus"
           },
           "definition": "label_values(tfs_device_execution_details_histogram_duration_bucket, step)",
           "hide": 0,
@@ -169,23 +210,27 @@
         {
           "allValue": ".*",
           "current": {
-            "selected": false,
-            "text": "All",
-            "value": "$__all"
+            "selected": true,
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
           },
           "datasource": {
             "type": "prometheus",
-            "uid": "b1BgiIsVz"
+            "uid": "prometheus"
           },
-          "definition": "label_values(tfs_device_execution_details_histogram_duration_bucket, operation)",
+          "definition": "label_values(tfs_device_execution_details_histogram_duration_bucket, pod)",
           "hide": 0,
           "includeAll": true,
-          "label": "Operation",
+          "label": "Pod",
           "multi": true,
-          "name": "operation",
+          "name": "pod",
           "options": [],
           "query": {
-            "query": "label_values(tfs_device_execution_details_histogram_duration_bucket, operation)",
+            "query": "label_values(tfs_device_execution_details_histogram_duration_bucket, pod)",
             "refId": "StandardVariableQuery"
           },
           "refresh": 2,
@@ -200,14 +245,14 @@
       ]
     },
     "time": {
-      "from": "now-2d",
+      "from": "now-15m",
       "to": "now"
     },
     "timepicker": {},
     "timezone": "",
-    "title": "TFS / Device Details",
-    "uid": "tfs-dev-confdev",
-    "version": 7,
+    "title": "TFS / Device Execution Details",
+    "uid": "tfs-dev-exec",
+    "version": 4,
     "weekStart": ""
   }
 }