diff --git a/bundles/routeros-monitoring/metadata.py b/bundles/routeros-monitoring/metadata.py
index dceaa25..cb2202f 100644
--- a/bundles/routeros-monitoring/metadata.py
+++ b/bundles/routeros-monitoring/metadata.py
@@ -3,7 +3,7 @@ input_defaults = {
         f"udp://{routeros_node.hostname}:161"
             for routeros_node in repo.nodes_in_group("routeros")
     ],
-    "agent_host_tag": "agent_host",
+    "agent_host_tag": "source",
     "version": 2,
     "community": "public",
     "max_repetitions": 5, # supposedly less spiky loads
@@ -31,7 +31,7 @@ defaults = {
                     },
                     "mapping": [
                         {
-                            "tag": "agent_host",
+                            "tags": ["source"],
                             "dest": "host",
                             "default": "unknown",
                             "value_mappings": {
diff --git a/bundles/telegraf/items.py b/bundles/telegraf/items.py
index 1d67ea8..e567e8e 100644
--- a/bundles/telegraf/items.py
+++ b/bundles/telegraf/items.py
@@ -42,6 +42,13 @@ files = {
             'svc_systemd:telegraf.service:restart',
         },
     },
+    '/etc/default/telegraf': {
+        'content': 'TELEGRAF_OPTS="--strict-env-handling"\n',
+        'mode': '0644',
+        'triggers': {
+            'svc_systemd:telegraf.service:restart',
+        },
+    },
     '/usr/local/share/telegraf/procio': {
         'content_type': 'download',
         'source': f"https://dl.sublimity.de/telegraf-procio/telegraf-procio-{node.metadata.get('system/architecture')}-latest",