diff --git a/host_vars/fyre.cachan-adm.crans.org.yml b/host_vars/fyre.cachan-adm.crans.org.yml
index d91ca74e..85ddec93 100644
--- a/host_vars/fyre.cachan-adm.crans.org.yml
+++ b/host_vars/fyre.cachan-adm.crans.org.yml
@@ -74,10 +74,7 @@ loc_prometheus:
 
   nginx:
     file: targets_nginx.json
-    targets:
-      - charybde.cachan-adm.crans.org
-      - rodauh.cachan-adm.crans.org
-      - terenez.cachan-adm.crans.org
+    targets: "{{ groups['nginx'] | select('match', '^.*\\.cachan-adm\\.crans\\.org$')  | list | sort }}"
     config:
       - job_name: nginx
         file_sd_configs:
diff --git a/host_vars/monitoring.adm.crans.org.yml b/host_vars/monitoring.adm.crans.org.yml
index 493ebca8..608b32a2 100644
--- a/host_vars/monitoring.adm.crans.org.yml
+++ b/host_vars/monitoring.adm.crans.org.yml
@@ -22,13 +22,7 @@ loc_prometheus:
 
   nginx:
     file: targets_nginx.json
-    targets:
-      - gitzly.adm.crans.org
-      - hodaur.adm.crans.org
-      - jitsi.adm.crans.org
-      - kiwi.adm.crans.org
-      - mailman.adm.crans.org
-      - roundcube.adm.crans.org
+    targets: "{{ groups['nginx'] | select('match', '^.*\\.adm\\.crans\\.org$')  | list | sort }}"
     config:
       - job_name: nginx
         file_sd_configs: