diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py
index 7d46f1f6..56874cb5 100644
--- a/scripts/dashboards_render_atlas.py
+++ b/scripts/dashboards_render_atlas.py
@@ -1767,7 +1767,7 @@ def build_overview():
             144,
             f"{ANANKE_UPS_TETHYS_NAME} UPS Current",
             None,
-            {"h": 2, "w": 6, "x": 0, "y": 9},
+            {"h": 3, "w": 6, "x": 0, "y": 9},
             unit="none",
             decimals=1,
             text_mode="name_and_value",
@@ -1809,17 +1809,17 @@ def build_overview():
             None,
             {"h": 3, "w": 6, "x": 0, "y": 12},
             unit="none",
-            text_mode="value",
+            text_mode="name_and_value",
             orientation="horizontal",
             wide_layout=True,
             graph_mode="none",
             targets=[
-                {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "C", "instant": True},
-                {"refId": "B", "expr": CLIMATE_TEMP_FAHRENHEIT_MAX, "legendFormat": "F", "instant": True},
+                {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "°C", "instant": True},
+                {"refId": "B", "expr": CLIMATE_TEMP_FAHRENHEIT_MAX, "legendFormat": "°F", "instant": True},
             ],
             field_overrides=[
-                {"matcher": {"id": "byName", "options": "C"}, "properties": [{"id": "unit", "value": "celsius"}]},
-                {"matcher": {"id": "byName", "options": "F"}, "properties": [{"id": "unit", "value": "fahrenheit"}]},
+                {"matcher": {"id": "byName", "options": "°C"}, "properties": [{"id": "unit", "value": "celsius"}]},
+                {"matcher": {"id": "byName", "options": "°F"}, "properties": [{"id": "unit", "value": "fahrenheit"}]},
             ],
             links=link_to("atlas-power"),
         )
@@ -1831,17 +1831,17 @@ def build_overview():
             None,
             {"h": 3, "w": 6, "x": 0, "y": 15},
             unit="none",
-            text_mode="value",
+            text_mode="name_and_value",
             orientation="horizontal",
             wide_layout=True,
             graph_mode="none",
             targets=[
-                {"refId": "A", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "RH", "instant": True},
-                {"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "P", "instant": True},
+                {"refId": "A", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "%RH", "instant": True},
+                {"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "kPa", "instant": True},
             ],
             field_overrides=[
-                {"matcher": {"id": "byName", "options": "RH"}, "properties": [{"id": "unit", "value": "suffix:%RH"}]},
-                {"matcher": {"id": "byName", "options": "P"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]},
+                {"matcher": {"id": "byName", "options": "%RH"}, "properties": [{"id": "unit", "value": "suffix:%RH"}]},
+                {"matcher": {"id": "byName", "options": "kPa"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]},
             ],
             links=link_to("atlas-power"),
         )
diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json
index 096f5da0..4742556c 100644
--- a/services/monitoring/dashboards/atlas-overview.json
+++ b/services/monitoring/dashboards/atlas-overview.json
@@ -1182,7 +1182,7 @@
         "uid": "atlas-vm"
       },
       "gridPos": {
-        "h": 2,
+        "h": 3,
         "w": 6,
         "x": 0,
         "y": 9
@@ -1348,13 +1348,13 @@
         {
           "refId": "A",
           "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius != 0)) or on() vector(0)",
-          "legendFormat": "C",
+          "legendFormat": "\u00b0C",
           "instant": true
         },
         {
           "refId": "B",
           "expr": "max((max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius != 0)) * 9 / 5 + 32) or on() vector(0)",
-          "legendFormat": "F",
+          "legendFormat": "\u00b0F",
           "instant": true
         }
       ],
@@ -1386,7 +1386,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "C"
+              "options": "\u00b0C"
             },
             "properties": [
               {
@@ -1398,7 +1398,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "F"
+              "options": "\u00b0F"
             },
             "properties": [
               {
@@ -1420,7 +1420,7 @@
           "fields": "",
           "values": false
         },
-        "textMode": "value",
+        "textMode": "name_and_value",
         "orientation": "horizontal",
         "wideLayout": true
       },
@@ -1450,13 +1450,13 @@
         {
           "refId": "A",
           "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_relative_humidity_percent != 0)) or on() vector(0)",
-          "legendFormat": "RH",
+          "legendFormat": "%RH",
           "instant": true
         },
         {
           "refId": "B",
           "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_vpd_kpa != 0)) or on() vector(0)",
-          "legendFormat": "P",
+          "legendFormat": "kPa",
           "instant": true
         }
       ],
@@ -1488,7 +1488,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "RH"
+              "options": "%RH"
             },
             "properties": [
               {
@@ -1500,7 +1500,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "P"
+              "options": "kPa"
             },
             "properties": [
               {
@@ -1522,7 +1522,7 @@
           "fields": "",
           "values": false
         },
-        "textMode": "value",
+        "textMode": "name_and_value",
         "orientation": "horizontal",
         "wideLayout": true
       },
diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml
index 9266636b..0460c124 100644
--- a/services/monitoring/grafana-dashboard-overview.yaml
+++ b/services/monitoring/grafana-dashboard-overview.yaml
@@ -1191,7 +1191,7 @@ data:
             "uid": "atlas-vm"
           },
           "gridPos": {
-            "h": 2,
+            "h": 3,
             "w": 6,
             "x": 0,
             "y": 9
@@ -1357,13 +1357,13 @@ data:
             {
               "refId": "A",
               "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius != 0)) or on() vector(0)",
-              "legendFormat": "C",
+              "legendFormat": "\u00b0C",
               "instant": true
             },
             {
               "refId": "B",
               "expr": "max((max without (job,instance,pod,service,endpoint,namespace) (typhon_temperature_celsius != 0)) * 9 / 5 + 32) or on() vector(0)",
-              "legendFormat": "F",
+              "legendFormat": "\u00b0F",
               "instant": true
             }
           ],
@@ -1395,7 +1395,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "C"
+                  "options": "\u00b0C"
                 },
                 "properties": [
                   {
@@ -1407,7 +1407,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "F"
+                  "options": "\u00b0F"
                 },
                 "properties": [
                   {
@@ -1429,7 +1429,7 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "value",
+            "textMode": "name_and_value",
             "orientation": "horizontal",
             "wideLayout": true
           },
@@ -1459,13 +1459,13 @@ data:
             {
               "refId": "A",
               "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_relative_humidity_percent != 0)) or on() vector(0)",
-              "legendFormat": "RH",
+              "legendFormat": "%RH",
               "instant": true
             },
             {
               "refId": "B",
               "expr": "max(max without (job,instance,pod,service,endpoint,namespace) (typhon_vpd_kpa != 0)) or on() vector(0)",
-              "legendFormat": "P",
+              "legendFormat": "kPa",
               "instant": true
             }
           ],
@@ -1497,7 +1497,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "RH"
+                  "options": "%RH"
                 },
                 "properties": [
                   {
@@ -1509,7 +1509,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "P"
+                  "options": "kPa"
                 },
                 "properties": [
                   {
@@ -1531,7 +1531,7 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "value",
+            "textMode": "name_and_value",
             "orientation": "horizontal",
             "wideLayout": true
           },