diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index 4f53dc492ced11a89aa96ca4473d54850f54106d..b063259ac2643a46c1e581ce719bebf239261557 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -75,8 +75,8 @@ blackbox_targets:
   smtp_starttls:
     - mail.archlinux.org:25
     - lists.archlinux.org:25
-  dns_geomirror_a: "{{ groups['geo_mirrors'] }}"
-  dns_geomirror_aaaa: "{{ groups['geo_mirrors'] }}"
+  geo_dns_geo.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}"
+  geo_dns_geo.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}"
 matrix_metrics_endpoints:
   - homeserver
   - appservice
diff --git a/roles/prometheus_exporters/templates/blackbox.yml.j2 b/roles/prometheus_exporters/templates/blackbox.yml.j2
index 9ba1a2a51a5545bd049f3b3bbc045efe1a0c019b..9f78648bfee69bf9f05b8be4f2528a121ec5542b 100644
--- a/roles/prometheus_exporters/templates/blackbox.yml.j2
+++ b/roles/prometheus_exporters/templates/blackbox.yml.j2
@@ -1,3 +1,4 @@
+#jinja2: lstrip_blocks: True
 modules:
   http_prometheus:
     prober: http
@@ -24,23 +25,25 @@ modules:
         - send: "EHLO prober\r"
         - expect: "^250"
         - send: "QUIT\r"
-  dns_geomirror_a:
+  {% for domain in geo_domains %}
+  geo_dns_{{ domain }}_a:
     prober: dns
     timeout: 5s
     dns:
-      query_name: geo.mirror.pkgbuild.com
+      query_name: {{ domain }}
       query_type: A
       preferred_ip_protocol: ip4
       validate_answer_rrs:
         fail_if_not_matches_regexp:
-          - geo\.mirror\.pkgbuild\.com\.\t.*\tIN\tA\t({{ groups['geo_mirrors'] | map('extract', hostvars, ['ipv4_address']) | join('|') | replace('.', '\.') }})
-  dns_geomirror_aaaa:
+          - {{ domain | replace('.', '\.') }}\.\t.*\tIN\tA\t({{ groups['geo_mirrors'] | map('extract', hostvars, ['ipv4_address']) | join('|') | replace('.', '\.') }})
+  geo_dns_{{ domain }}_aaaa:
     prober: dns
     timeout: 5s
     dns:
-      query_name: geo.mirror.pkgbuild.com
+      query_name: {{ domain }}
       query_type: AAAA
       preferred_ip_protocol: ip6
       validate_answer_rrs:
         fail_if_not_matches_regexp:
-          - geo\.mirror\.pkgbuild\.com\.\t.*\tIN\tAAAA\t({{ groups['geo_mirrors'] | map('extract', hostvars, ['ipv6_address']) | join('|') }})
+          - {{ domain | replace('.', '\.') }}\.\t.*\tIN\tAAAA\t({{ groups['geo_mirrors'] | map('extract', hostvars, ['ipv6_address']) | join('|') }})
+  {% endfor %}