diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index b74b0316..0fad2b3d 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -23,7 +23,6 @@
   docker_network:
     name: "{{ matrix_docker_network }}"
     driver: bridge
-  register: matrix_docker_network_info
 
 - name: Ensure matrix-remove-all script created
   template:
diff --git a/roles/matrix-prometheus/defaults/main.yml b/roles/matrix-prometheus/defaults/main.yml
index 10424424..a0e79acc 100644
--- a/roles/matrix-prometheus/defaults/main.yml
+++ b/roles/matrix-prometheus/defaults/main.yml
@@ -26,6 +26,9 @@ matrix_prometheus_systemd_wanted_services_list: []
 # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:9090"), or empty string to not expose.
 matrix_prometheus_container_http_host_bind_port: ''
 
+# Target addresses for the "node" scraper configuration.
+# Unless you define this as a non-empty list, it gets populated at runtime with the IP address of `matrix-prometheus-node-exporter` and port 9100.
+matrix_prometheus_endpoint_node_targets: []
 
 # Default prometheus configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
diff --git a/roles/matrix-prometheus/tasks/setup.yml b/roles/matrix-prometheus/tasks/setup.yml
index 1746b961..c9a207ec 100644
--- a/roles/matrix-prometheus/tasks/setup.yml
+++ b/roles/matrix-prometheus/tasks/setup.yml
@@ -24,7 +24,22 @@
     - "{{ matrix_prometheus_config_path }}"
     - "{{ matrix_prometheus_data_path }}"
   when: matrix_prometheus_enabled|bool
-  
+
+- block:
+    # Well, this actually creates the network if it doesn't exist, but..
+    # The network should have been created by `matrix-base` already.
+    # We don't rely on that other call and its result, because it runs
+    # on `--tags=setup-all`, but will get skipped during `--tags=setup-prometheus`.
+    - name: Fetch Matrix Docker network details
+      docker_network:
+        name: "{{ matrix_docker_network }}"
+        driver: bridge
+      register: matrix_docker_network_info
+
+    - set_fact:
+        matrix_prometheus_endpoint_node_targets: ["{{ matrix_docker_network_info.network.IPAM.Config[0].Gateway }}:9100"]
+  when: "matrix_prometheus_enabled|bool and matrix_prometheus_node_exporter_enabled|bool and matrix_prometheus_endpoint_node_targets|length == 0"
+
 - name: Ensure prometheus.yml installed
   copy:
     content: "{{ matrix_prometheus_configuration|to_nice_yaml }}"
diff --git a/roles/matrix-prometheus/templates/prometheus.yml.j2 b/roles/matrix-prometheus/templates/prometheus.yml.j2
index 08e6fcf1..4fdf9905 100644
--- a/roles/matrix-prometheus/templates/prometheus.yml.j2
+++ b/roles/matrix-prometheus/templates/prometheus.yml.j2
@@ -36,5 +36,5 @@ scrape_configs:
   {% if matrix_prometheus_node_exporter_enabled %}
   - job_name: node
     static_configs:
-      - targets: ['{{ matrix_docker_network_info.network.IPAM.Config[0].Gateway }}:9100']
+      - targets: {{ matrix_prometheus_endpoint_node_targets|to_json }}
   {% endif %}