diff --git a/roles/grafana/files/public-dashboards/geo_mirrors.json b/roles/grafana/files/public-dashboards/geo_mirrors.json
new file mode 120000
index 0000000000000000000000000000000000000000..8057645abcbc17c75fbfdfe1232c638f90df55b9
--- /dev/null
+++ b/roles/grafana/files/public-dashboards/geo_mirrors.json
@@ -0,0 +1 @@
+../dashboards/geo_mirrors.json
\ No newline at end of file
diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index 3ba228c1b2dbe7023d5fa36bce2f4e2b02325b85..85bc59fc76edceeb9cf71378e073a00593f2b311 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -4,14 +4,18 @@ prometheus_domain: "{{ hostvars['dashboards.archlinux.org']['wireguard_address']
 prometheus_mysqld_exporter_port: '9104'
 prometheus_receive_only: false
 prometheus_remote_write_relabel_configs:
-  - label: job
+  - label: [job]
     regex: debuginfod
-  - label: job
+  - label: [job]
     regex: aurweb
-  - label: job
+  - label: [job]
     regex: goaurrpc
-  - label: __name__
+  - label: [__name__]
     regex: "archive_directory_size_bytes|archive_total_packages|rebuilderd_results|rebuilderd_workers|rebuilderd_queue_length|repository_directory_size_bytes|aur_.+|flyspray_issues"
+  - label: [__name__, device, instance]
+    regex: "node_network_transmit_bytes_total;en.*;.*\\\\.mirror\\\\.pkgbuild\\\\.com"
+  - label: [__name__, instance]
+    regex: "pdns_auth_udp_queries;.*\\\\.mirror\\\\.pkgbuild\\\\.com"
 
 blackbox_targets:
   http_prometheus:
diff --git a/roles/prometheus/templates/prometheus.yml.j2 b/roles/prometheus/templates/prometheus.yml.j2
index 49734f5b72959ae034bba4df21cfdf7c76f8e141..c872a178df098d6f40a7d95b591653d29f7b4cf3 100644
--- a/roles/prometheus/templates/prometheus.yml.j2
+++ b/roles/prometheus/templates/prometheus.yml.j2
@@ -18,7 +18,7 @@ remote_write:
   {% for relabel_config in prometheus_remote_write_relabel_configs %}
   - url: http://{{ prometheus_domain }}:9090/api/v1/write
     write_relabel_configs:
-      - source_labels: [{{ relabel_config.label }}]
+      - source_labels: [{{ relabel_config.label | join(',') }}]
         regex: "{{ relabel_config.regex }}"
         action: keep
     basic_auth: