diff --git a/fluentd/meta/prometheus.yml b/fluentd/meta/prometheus.yml
index 3c56a49..e3fbe17 100644
--- a/fluentd/meta/prometheus.yml
+++ b/fluentd/meta/prometheus.yml
@@ -15,5 +15,10 @@
         endpoint:
           - address: {{ address }}
             port: 24231
+        relabel_configs:
+          - regex: {{ address }}:24231
+            replacement: {{ grains['host'] }}
+            source_labels: "__address__"
+            target_label: "host"
   {%- endif %}
 {%- endif %}
diff --git a/tests/pillar/repo_tdagent.sls b/tests/pillar/repo_tdagent.sls
index 42f0b13..6913d7e 100644
--- a/tests/pillar/repo_tdagent.sls
+++ b/tests/pillar/repo_tdagent.sls
@@ -3,7 +3,7 @@
     enabled: true
     repo:
       td-agent:
-        source: 'deb  http://mirror.mirantis.com/testing/td-agent-{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} contrib'
+        source: 'deb [arch=amd64] http://mirror.mirantis.com/testing/td-agent/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} contrib'
         key_url: 'http://packages.treasuredata.com.s3.amazonaws.com/GPG-KEY-td-agent'
       openstack-pike:
         source: 'deb [arch=amd64] http://apt.mirantis.com/{{ grains.get('oscodename') }}/openstack/pike/ testing main'