diff --git a/k8s/infra/monitoring/dashboards/dashboard-infrastructure.yaml b/k8s/infra/monitoring/dashboards/dashboard-infrastructure.yaml
index abd2b0f..53282a0 100644
--- a/k8s/infra/monitoring/dashboards/dashboard-infrastructure.yaml
+++ b/k8s/infra/monitoring/dashboards/dashboard-infrastructure.yaml
@@ -57,7 +57,7 @@ data:
           "targets": [
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "avg(100 - (avg by (instance) (irate(node_cpu_seconds_total{mode=\"idle\",instance=~\"192\\.168\\.10\\.(11|12|13):9100\"}[5m])) * 100))",
+              "expr": "avg(100 - (avg by (instance) (irate(node_cpu_seconds_total{mode=\"idle\",job=\"node-exporter\"}[5m])) * 100))",
               "legendFormat": "CPU avg",
               "refId": "A"
             }
@@ -97,7 +97,7 @@ data:
           "targets": [
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "avg(100 - (node_memory_MemAvailable_bytes{instance=~\"192\\.168\\.10\\.(11|12|13):9100\"} / node_memory_MemTotal_bytes{instance=~\"192\\.168\\.10\\.(11|12|13):9100\"} * 100))",
+              "expr": "avg(100 - (node_memory_MemAvailable_bytes{job=\"node-exporter\"} / node_memory_MemTotal_bytes{job=\"node-exporter\"} * 100))",
               "legendFormat": "RAM avg",
               "refId": "A"
             }
@@ -135,7 +135,7 @@ data:
           "targets": [
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "avg(node_load1{instance=~\"192\\.168\\.10\\.(11|12|13):9100\"})",
+              "expr": "avg(node_load1{job=\"node-exporter\"})",
               "legendFormat": "Load1",
               "refId": "A"
             }
@@ -169,7 +169,7 @@ data:
           "targets": [
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "100 - (avg by (instance) (irate(node_cpu_seconds_total{mode=\"idle\",instance=~\"192\\.168\\.10\\.(11|12|13):9100\"}[5m])) * 100)",
+              "expr": "100 - (avg by (instance) (irate(node_cpu_seconds_total{mode=\"idle\",job=\"node-exporter\"}[5m])) * 100)",
               "legendFormat": "{{instance}}",
               "refId": "A"
             }
@@ -203,7 +203,7 @@ data:
           "targets": [
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "100 - (node_memory_MemAvailable_bytes{instance=~\"192\\.168\\.10\\.(11|12|13):9100\"} / node_memory_MemTotal_bytes{instance=~\"192\\.168\\.10\\.(11|12|13):9100\"} * 100)",
+              "expr": "100 - (node_memory_MemAvailable_bytes{job=\"node-exporter\"} / node_memory_MemTotal_bytes{job=\"node-exporter\"} * 100)",
               "legendFormat": "{{instance}}",
               "refId": "A"
             }
@@ -236,13 +236,13 @@ data:
           "targets": [
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "sum by (instance) (irate(node_network_receive_bytes_total{instance=~\"192\\.168\\.10\\.(11|12|13):9100\",device!~\"lo|veth.*|flannel.*|cni.*\"}[5m]))",
+              "expr": "sum by (instance) (irate(node_network_receive_bytes_total{job=\"node-exporter\",device!~\"lo|veth.*|flannel.*|cni.*\"}[5m]))",
               "legendFormat": "rx {{instance}}",
               "refId": "A"
             },
             {
               "datasource": {"type": "prometheus", "uid": "${datasource}"},
-              "expr": "sum by (instance) (irate(node_network_transmit_bytes_total{instance=~\"192\\.168\\.10\\.(11|12|13):9100\",device!~\"lo|veth.*|flannel.*|cni.*\"}[5m]))",
+              "expr": "sum by (instance) (irate(node_network_transmit_bytes_total{job=\"node-exporter\",device!~\"lo|veth.*|flannel.*|cni.*\"}[5m]))",
               "legendFormat": "tx {{instance}}",
               "refId": "B"
             }