diff --git a/docker-compose/grafana/dashboards/lofar2.0-station.json b/docker-compose/grafana/dashboards/lofar2.0-station.json
index b75c14874616926b4dc6352b93a7e4374cb9840b..aeebc413d923308a03a08c17ab3824d9173c5765 100644
--- a/docker-compose/grafana/dashboards/lofar2.0-station.json
+++ b/docker-compose/grafana/dashboards/lofar2.0-station.json
@@ -40,7 +40,7 @@
                   "text": "ON"
                 },
                 "1": {
-                  "color": "purple",
+                  "color": "red",
                   "index": 3,
                   "text": "OFF"
                 },
@@ -122,23 +122,23 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "continuous-GrYlRd"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 1
+            "mode": "thresholds"
           },
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
+                "color": "transparent",
                 "value": null
               },
+              {
+                "color": "green",
+                "value": 50
+              },
               {
                 "color": "red",
-                "value": 80
+                "value": 100
               }
             ]
           }
@@ -151,34 +151,180 @@
         "x": 0,
         "y": 8
       },
-      "id": 2,
+      "id": 11,
       "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single"
+        "text": {},
+        "textMode": "name"
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "(50+50*device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_communication_error_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_RW\"}",
+          "format": "time_series",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "{{x}}",
+          "refId": "A"
         }
+      ],
+      "title": "FPGA communication",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": "Prometheus",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "transparent",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 50
+              },
+              {
+                "color": "red",
+                "value": 100
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 5,
+        "x": 5,
+        "y": 8
+      },
+      "id": 9,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "name"
       },
       "pluginVersion": "8.1.2",
       "targets": [
         {
           "exemplar": true,
-          "expr": "100*device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_communication_error_R\"}",
+          "expr": "(100-50*device_attribute{device=\"lts/sdp/1\",name=\"FPGA_processing_enable_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_RW\"}",
           "format": "time_series",
           "hide": false,
+          "instant": true,
           "interval": "",
           "legendFormat": "{{x}}",
           "refId": "A"
         }
       ],
-      "title": "FPGA communication errors",
+      "title": "FPGA processing enabled",
       "transformations": [],
-      "type": "status-history"
+      "type": "stat"
+    },
+    {
+      "datasource": "Prometheus",
+      "description": "Number of inputs that are fed from the SDP wave-form generator",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "index": 0,
+                  "text": "OFF"
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 2,
+        "x": 10,
+        "y": 8
+      },
+      "id": 12,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "text": {},
+        "textMode": "value"
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "sum(sum by(x) (device_attribute{device=\"lts/sdp/1\",name=\"FPGA_wg_enable_RW\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_R\"})",
+          "format": "time_series",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "{{x}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Waveform generator",
+      "transformations": [],
+      "type": "stat"
     },
     {
       "datasource": "Prometheus",
@@ -186,11 +332,35 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "continuous-GrYlRd"
+            "mode": "palette-classic"
           },
           "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 1
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
           },
           "mappings": [],
           "thresholds": {
@@ -212,18 +382,16 @@
       "gridPos": {
         "h": 8,
         "w": 5,
-        "x": 5,
-        "y": 8
+        "x": 0,
+        "y": 16
       },
-      "id": 6,
+      "id": 5,
       "options": {
-        "colWidth": 0.9,
         "legend": {
-          "displayMode": "list",
+          "calcs": [],
+          "displayMode": "hidden",
           "placement": "bottom"
         },
-        "rowHeight": 0.9,
-        "showValue": "never",
         "tooltip": {
           "mode": "single"
         }
@@ -232,21 +400,22 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "100-100*device_attribute{device=\"lts/sdp/1\",name=\"FPGA_processing_enable_R\"}",
+          "expr": "device_attribute{device=\"lts/sdp/1\",name=\"FPGA_temp_R\"}",
           "format": "time_series",
           "hide": false,
+          "instant": false,
           "interval": "",
           "legendFormat": "{{x}}",
           "refId": "A"
         }
       ],
-      "title": "FPGA processing enabled",
+      "title": "FPGA temperatures",
       "transformations": [],
-      "type": "status-history"
+      "type": "timeseries"
     },
     {
       "datasource": "Prometheus",
-      "description": "",
+      "description": "Measured difference between PTP and PPS",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -285,12 +454,16 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
+                "color": "red",
                 "value": null
               },
+              {
+                "color": "green",
+                "value": 0.001
+              },
               {
                 "color": "red",
-                "value": 80
+                "value": 0.1
               }
             ]
           }
@@ -300,14 +473,14 @@
       "gridPos": {
         "h": 8,
         "w": 5,
-        "x": 10,
-        "y": 8
+        "x": 5,
+        "y": 16
       },
-      "id": 5,
+      "id": 13,
       "options": {
         "legend": {
           "calcs": [],
-          "displayMode": "list",
+          "displayMode": "hidden",
           "placement": "bottom"
         },
         "tooltip": {
@@ -318,7 +491,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/sdp/1\",name=\"FPGA_temp_R\"}",
+          "expr": "device_attribute{device=\"lts/sdp/1\",name=\"TR_tod_pps_delta_R\"} / 1e9",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -327,11 +500,12 @@
           "refId": "A"
         }
       ],
-      "title": "FPGA temperatures",
+      "title": "FPGA Clock offset",
       "transformations": [],
       "type": "timeseries"
     }
   ],
+  "refresh": false,
   "schemaVersion": 30,
   "style": "dark",
   "tags": [],
@@ -345,6 +519,6 @@
   "timepicker": {},
   "timezone": "",
   "title": "LOFAR2.0 Station",
-  "uid": "jCzG0a47z",
-  "version": 4
+  "uid": "xZPJHE47k",
+  "version": 6
 }