diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 9f8b8821e..ee5f3a380 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -1388,10 +1388,10 @@ grafana:
             w: 4
         monitor_interface_traffic_stat:
           gridPos:
-            x: 8
+            x: 0
             y: 5
             h: 4
-            w: 4
+            w: 12
         zeek_packet_loss_stat:
           gridPos:
             x: 12
diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
index 7d0f67135..ecfe537e1 100644
--- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
@@ -87,6 +87,8 @@
     "legend": {
       "displayMode": "table",
       "placement": "right",
+      "sort": "lastNotNull",
+      "sortDesc": false,
       "calcs": [
         "max",
         "mean",
diff --git a/salt/grafana/panels/system_uptime_graph.json.jinja b/salt/grafana/panels/system_uptime_graph.json.jinja
index bf26b520f..2f2550216 100644
--- a/salt/grafana/panels/system_uptime_graph.json.jinja
+++ b/salt/grafana/panels/system_uptime_graph.json.jinja
@@ -146,3 +146,156 @@
   "decimals": 1,
   "description": ""
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+  "id": 69016,
+  "gridPos": {
+    "h": 8,
+    "w": 12,
+    "x": 0,
+    "y": 1
+  },
+  "type": "timeseries",
+  "title": "System Uptime",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "s",
+      "decimals": 1,
+      "min": 0,
+      "max": 604800
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "sort": "lastNotNull",
+      "sortDesc": false,
+      "calcs": [
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "role"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "system",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "uptime"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        }
+      ]
+    }
+  ],
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null,
+  "interval": "30"
+}
diff --git a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja
index ad4ff2805..a656f6522 100644
--- a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja
@@ -1,43 +1,29 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 68896,
   "gridPos": {
     "x": {{ PANELS.uptime_docker_combined_current_graph.gridPos.x }},
     "y": {{ PANELS.uptime_docker_combined_current_graph.gridPos.y }},
     "w": {{ PANELS.uptime_docker_combined_current_graph.gridPos.w }},
     "h": {{ PANELS.uptime_docker_combined_current_graph.gridPos.h }}
   },
-  "id": 68896,
-  "legend": {
-    "alignAsTable": true,
-    "avg": false,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": false,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
+  "type": "timeseries",
+  "title": "Container Uptime Current",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
   "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "sort": "lastNotNull",
+      "sortDesc": false,
+      "calcs": [
+        "lastNotNull"
+      ]
+    }
   },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
   "targets": [
     {
       "alias": "$tag_host $tag_role $tag_container_name",
@@ -55,16 +41,16 @@
           "type": "tag"
         },
         {
-          "type": "tag",
           "params": [
             "host"
-          ]
+          ],
+          "type": "tag"
         },
         {
-          "type": "tag",
           "params": [
             "role"
-          ]
+          ],
+          "type": "tag"
         },
         {
           "params": [
@@ -73,6 +59,7 @@
           "type": "fill"
         }
       ],
+      "limit": "",
       "measurement": "docker_container_status",
       "orderByTime": "ASC",
       "policy": "default",
@@ -84,17 +71,18 @@
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "uptime_ns"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "last",
-            "params": []
+            "params": [],
+            "type": "last"
           }
         ]
       ],
+      "slimit": "",
       "tags": [
         {
           "key": "host",
@@ -107,62 +95,60 @@
           "operator": "=~",
           "value": "/^$containers$/"
         }
-      ],
-      "slimit": "",
-      "limit": ""
+      ]
     }
   ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Container Uptime Current",
-  "tooltip": {
-    "shared": true,
-    "sort": 1,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:192",
-      "format": "ns",
-      "label": null,
-      "logBase": 1,
-      "max": "604800000000000",
-      "min": "0",
-      "show": true,
-      "decimals": 1
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "ns",
+      "decimals": 1,
+      "min": 0,
+      "max": 604800000000000
     },
-    {
-      "$$hashKey": "object:193",
-      "decimals": 2,
-      "format": "short",
-      "label": "",
-      "logBase": 1,
-      "max": null,
-      "min": "0",
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
+    "overrides": []
   },
-  "bars": false,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "interval": "30s",
   "timeFrom": null,
   "timeShift": null
 }