diff --git a/dashboards/bst.json b/dashboards/bst.json
index 78f026765d87e71c740810c06c742d8c6228d9fb..b951769e1487da18968fc16c4a49e62e6d93fcec 100644
--- a/dashboards/bst.json
+++ b/dashboards/bst.json
@@ -381,7 +381,7 @@
             "uid": "prometheus"
           },
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/1\",name=\"TR_fpga_mask_R\"}",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"}",
           "interval": "",
           "legendFormat": "{{x}}",
           "refId": "A"
diff --git a/dashboards/clock.json b/dashboards/clock.json
index 211bac6e4dd44fad60f4c8d753a6d9283aa55aef..4b17a651045d9860431f18f36b29adaba05bf415 100644
--- a/dashboards/clock.json
+++ b/dashboards/clock.json
@@ -710,7 +710,7 @@
             "uid": "prometheus"
           },
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_tod_pps_delta_R\"}",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_tod_pps_delta_R\"}",
           "instant": false,
           "interval": "",
           "legendFormat": "{{name}}",
diff --git a/dashboards/sdp.json b/dashboards/sdp.json
index 3a305d52eebf7fe4a45a173735b020e89d41a969..9524a0539e553700e72e8a94727d08a775489e7f 100644
--- a/dashboards/sdp.json
+++ b/dashboards/sdp.json
@@ -835,7 +835,7 @@
             "uid": "prometheus"
           },
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_communication_error_R\"}\r\n+ on(x) (device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_firmware_version_R\"} == bool 0)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"})",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_communication_error_R\"}\r\n+ on(x) (device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_firmware_version_R\"} == bool 0)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"})",
           "interval": "",
           "legendFormat": "{{x}}",
           "refId": "A"
@@ -1388,7 +1388,7 @@
             "uid": "prometheus"
           },
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_tod_pps_delta_R\"}",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_tod_pps_delta_R\"}",
           "instant": false,
           "interval": "",
           "legendFormat": "{{name}}",
diff --git a/dashboards/sensors.json b/dashboards/sensors.json
index 9970a04d220fad7131744f281eff5f3d44b20930..f831161b79676a0998b9446a3878c91395f8538f 100644
--- a/dashboards/sensors.json
+++ b/dashboards/sensors.json
@@ -1173,7 +1173,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_tod_pps_delta_R\"}",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_tod_pps_delta_R\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
diff --git a/dashboards/sst.json b/dashboards/sst.json
index d3ab17c358d5e475ba844cec3d59fd21f789132e..0ca64caa2b37ed5aebd27a2f49f10cd0047bdb81 100644
--- a/dashboards/sst.json
+++ b/dashboards/sst.json
@@ -381,7 +381,7 @@
             "uid": "prometheus"
           },
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/1\",name=\"TR_fpga_mask_R\"}",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"}",
           "interval": "",
           "legendFormat": "{{x}}",
           "refId": "A"
diff --git a/dashboards/xst.json b/dashboards/xst.json
index e2beb9a3b5c235aa811e96942cfcea05c10cc428..c608e2a728f919b58edda725ab6ef319c031f506 100644
--- a/dashboards/xst.json
+++ b/dashboards/xst.json
@@ -381,7 +381,7 @@
             "uid": "prometheus"
           },
           "exemplar": true,
-          "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/1\",name=\"TR_fpga_mask_R\"}",
+          "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"}",
           "interval": "",
           "legendFormat": "{{x}}",
           "refId": "A"