diff --git a/prometheus/files/server/prometheus.yml b/prometheus/files/server/prometheus.yml
index 055eb69..7611b97 100644
--- a/prometheus/files/server/prometheus.yml
+++ b/prometheus/files/server/prometheus.yml
@@ -384,4 +384,10 @@
       target_label: environment
       replacement: {{ server.config.environment_label }}
     {%- endif %}
+    {%- if endpoint.name in ['remote_agent', 'remote_agent_openstack', 'elasticsearch_exporter'] %}
+    - source_labels: ['__meta_dns_name']
+      regex: ^tasks.(.*)$
+      replacement: $1:{{ endpoint.port }}
+      target_label: 'instance'
+    {%- endif %}
 {%- endfor %}