diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json
index fb0c76452e3bb629fb8e8532569cde7b3f719623..272d54ea17360707fcc02ee519e46ec156839c5d 100644
--- a/assets/grafana/node-dashboard.json
+++ b/assets/grafana/node-dashboard.json
@@ -100,7 +100,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=~\"$server\"}[5m])) * 100)",
+              "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=\"$server\"}[5m])) * 100)",
               "hide": false,
               "intervalFactor": 10,
               "legendFormat": "{{cpu}}",
@@ -188,7 +188,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "node_load1{instance=~\"$server\"}",
+              "expr": "node_load1{instance=\"$server\"}",
               "intervalFactor": 4,
               "legendFormat": "load 1m",
               "refId": "A",
@@ -196,7 +196,7 @@
               "target": ""
             },
             {
-              "expr": "node_load5{instance=~\"$server\"}",
+              "expr": "node_load5{instance=\"$server\"}",
               "intervalFactor": 4,
               "legendFormat": "load 5m",
               "refId": "B",
@@ -204,7 +204,7 @@
               "target": ""
             },
             {
-              "expr": "node_load15{instance=~\"$server\"}",
+              "expr": "node_load15{instance=\"$server\"}",
               "intervalFactor": 4,
               "legendFormat": "load 15m",
               "refId": "C",
@@ -305,7 +305,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "node_memory_MemTotal{instance=~\"$server\"} - node_memory_MemFree{instance=~\"$server\"}",
+              "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}",
               "intervalFactor": 2,
               "legendFormat": "memory usage",
               "metric": "memo",
@@ -314,7 +314,7 @@
               "target": ""
             },
             {
-              "expr": "node_memory_MemTotal{instance=~\"$server\"}",
+              "expr": "node_memory_MemTotal{instance=\"$server\"}",
               "intervalFactor": 2,
               "legendFormat": "memory total",
               "metric": "memo",
@@ -414,7 +414,7 @@
           },
           "targets": [
             {
-              "expr": "((node_memory_MemTotal{instance=~\"$server\"} - node_memory_MemFree{instance=~\"$server\"}) / node_memory_MemTotal{instance=~\"$server\"}) * 100",
+              "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100",
               "intervalFactor": 2,
               "refId": "A",
               "step": 60,
@@ -502,7 +502,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum by (instance) (rate(node_disk_bytes_read{instance=~\"$server\"}[2m]))",
+              "expr": "sum by (instance) (rate(node_disk_bytes_read{instance=\"$server\"}[2m]))",
               "hide": false,
               "intervalFactor": 4,
               "legendFormat": "read",
@@ -511,14 +511,14 @@
               "target": ""
             },
             {
-              "expr": "sum by (instance) (rate(node_disk_bytes_written{instance=~\"$server\"}[2m]))",
+              "expr": "sum by (instance) (rate(node_disk_bytes_written{instance=\"$server\"}[2m]))",
               "intervalFactor": 4,
               "legendFormat": "written",
               "refId": "B",
               "step": 8
             },
             {
-              "expr": "sum by (instance) (rate(node_disk_io_time_ms{instance=~\"$server\"}[2m]))",
+              "expr": "sum by (instance) (rate(node_disk_io_time_ms{instance=\"$server\"}[2m]))",
               "intervalFactor": 4,
               "legendFormat": "io time",
               "refId": "C",
@@ -616,7 +616,7 @@
           },
           "targets": [
             {
-              "expr": "(sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"}) - sum(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"})) / sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})",
+              "expr": "(sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"}) - sum(node_filesystem_free{device!=\"rootfs\",instance=\"$server\"})) / sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"})",
               "intervalFactor": 2,
               "refId": "A",
               "step": 60,
@@ -696,7 +696,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "rate(node_network_receive_bytes{instance=~\"$server\",device!~\"lo\"}[5m])",
+              "expr": "rate(node_network_receive_bytes{instance=\"$server\",device!~\"lo\"}[5m])",
               "hide": false,
               "intervalFactor": 2,
               "legendFormat": "{{device}}",
@@ -790,7 +790,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "rate(node_network_transmit_bytes{instance=~\"$server\",device!~\"lo\"}[5m])",
+              "expr": "rate(node_network_transmit_bytes{instance=\"$server\",device!~\"lo\"}[5m])",
               "hide": false,
               "intervalFactor": 2,
               "legendFormat": "{{device}}",
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml
index 081bb2f613d0e9288a6d9c74c4d6fdba81157401..ff418fec9b10e140d6e8161d5306fe0ad4289e95 100644
--- a/manifests/grafana/grafana-cm.yaml
+++ b/manifests/grafana/grafana-cm.yaml
@@ -2212,7 +2212,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=~\"$server\"}[5m])) * 100)",
+                  "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=\"$server\"}[5m])) * 100)",
                   "hide": false,
                   "intervalFactor": 10,
                   "legendFormat": "{{cpu}}",
@@ -2300,7 +2300,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "node_load1{instance=~\"$server\"}",
+                  "expr": "node_load1{instance=\"$server\"}",
                   "intervalFactor": 4,
                   "legendFormat": "load 1m",
                   "refId": "A",
@@ -2308,7 +2308,7 @@ data:
                   "target": ""
                 },
                 {
-                  "expr": "node_load5{instance=~\"$server\"}",
+                  "expr": "node_load5{instance=\"$server\"}",
                   "intervalFactor": 4,
                   "legendFormat": "load 5m",
                   "refId": "B",
@@ -2316,7 +2316,7 @@ data:
                   "target": ""
                 },
                 {
-                  "expr": "node_load15{instance=~\"$server\"}",
+                  "expr": "node_load15{instance=\"$server\"}",
                   "intervalFactor": 4,
                   "legendFormat": "load 15m",
                   "refId": "C",
@@ -2417,7 +2417,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "node_memory_MemTotal{instance=~\"$server\"} - node_memory_MemFree{instance=~\"$server\"}",
+                  "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}",
                   "intervalFactor": 2,
                   "legendFormat": "memory usage",
                   "metric": "memo",
@@ -2426,7 +2426,7 @@ data:
                   "target": ""
                 },
                 {
-                  "expr": "node_memory_MemTotal{instance=~\"$server\"}",
+                  "expr": "node_memory_MemTotal{instance=\"$server\"}",
                   "intervalFactor": 2,
                   "legendFormat": "memory total",
                   "metric": "memo",
@@ -2526,7 +2526,7 @@ data:
               },
               "targets": [
                 {
-                  "expr": "((node_memory_MemTotal{instance=~\"$server\"} - node_memory_MemFree{instance=~\"$server\"}) / node_memory_MemTotal{instance=~\"$server\"}) * 100",
+                  "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100",
                   "intervalFactor": 2,
                   "refId": "A",
                   "step": 60,
@@ -2614,7 +2614,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "sum by (instance) (rate(node_disk_bytes_read{instance=~\"$server\"}[2m]))",
+                  "expr": "sum by (instance) (rate(node_disk_bytes_read{instance=\"$server\"}[2m]))",
                   "hide": false,
                   "intervalFactor": 4,
                   "legendFormat": "read",
@@ -2623,14 +2623,14 @@ data:
                   "target": ""
                 },
                 {
-                  "expr": "sum by (instance) (rate(node_disk_bytes_written{instance=~\"$server\"}[2m]))",
+                  "expr": "sum by (instance) (rate(node_disk_bytes_written{instance=\"$server\"}[2m]))",
                   "intervalFactor": 4,
                   "legendFormat": "written",
                   "refId": "B",
                   "step": 8
                 },
                 {
-                  "expr": "sum by (instance) (rate(node_disk_io_time_ms{instance=~\"$server\"}[2m]))",
+                  "expr": "sum by (instance) (rate(node_disk_io_time_ms{instance=\"$server\"}[2m]))",
                   "intervalFactor": 4,
                   "legendFormat": "io time",
                   "refId": "C",
@@ -2728,7 +2728,7 @@ data:
               },
               "targets": [
                 {
-                  "expr": "(sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"}) - sum(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"})) / sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})",
+                  "expr": "(sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"}) - sum(node_filesystem_free{device!=\"rootfs\",instance=\"$server\"})) / sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"})",
                   "intervalFactor": 2,
                   "refId": "A",
                   "step": 60,
@@ -2808,7 +2808,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "rate(node_network_receive_bytes{instance=~\"$server\",device!~\"lo\"}[5m])",
+                  "expr": "rate(node_network_receive_bytes{instance=\"$server\",device!~\"lo\"}[5m])",
                   "hide": false,
                   "intervalFactor": 2,
                   "legendFormat": "{{device}}",
@@ -2902,7 +2902,7 @@ data:
               "steppedLine": false,
               "targets": [
                 {
-                  "expr": "rate(node_network_transmit_bytes{instance=~\"$server\",device!~\"lo\"}[5m])",
+                  "expr": "rate(node_network_transmit_bytes{instance=\"$server\",device!~\"lo\"}[5m])",
                   "hide": false,
                   "intervalFactor": 2,
                   "legendFormat": "{{device}}",