diff --git a/log-1.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf b/log-1.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
index 85b55041..52b5dabc 100644
--- a/log-1.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
+++ b/log-1.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
@@ -9,26 +9,10 @@
 [[inputs.tail]]
   files = ["/var/log/eidas_proxy.log"]
   data_format = "json"
-  tag_keys = ["type",
-              "timestamp",
-              "connectorEntityId",
-              "requesterId",
-              "loaMatching",
-              "connectorCuntry",
-              "spType",
-              "requestedLoa",
-              "eidasResponseLoA",
-              "eidasRequestId",
-              "eidasResponseId",
-              "principal",
-              "nationalAssertionId",
-              "nationalRequestId",
-              "nationalIdP",
-              "eIDASAssertionIssueTime",
-              "eidasAssertionId"]
-  json_time_key = "timestamp"
-  json_time_format = "unix_ms"
-  json_timezone = "Local"
+  json_name_key = "type"
+  tag_keys = ["type", "requesterId", "connectorCuntry"]
+  [inputs.tail.tags]
+    influxdb_database = "proxy"
 [[processors.parser]]
   parse_fields = ["message"]
   merge = "override"
diff --git a/log-2.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf b/log-2.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
index 85b55041..52b5dabc 100644
--- a/log-2.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
+++ b/log-2.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf
@@ -9,26 +9,10 @@
 [[inputs.tail]]
   files = ["/var/log/eidas_proxy.log"]
   data_format = "json"
-  tag_keys = ["type",
-              "timestamp",
-              "connectorEntityId",
-              "requesterId",
-              "loaMatching",
-              "connectorCuntry",
-              "spType",
-              "requestedLoa",
-              "eidasResponseLoA",
-              "eidasRequestId",
-              "eidasResponseId",
-              "principal",
-              "nationalAssertionId",
-              "nationalRequestId",
-              "nationalIdP",
-              "eIDASAssertionIssueTime",
-              "eidasAssertionId"]
-  json_time_key = "timestamp"
-  json_time_format = "unix_ms"
-  json_timezone = "Local"
+  json_name_key = "type"
+  tag_keys = ["type", "requesterId", "connectorCuntry"]
+  [inputs.tail.tags]
+    influxdb_database = "proxy"
 [[processors.parser]]
   parse_fields = ["message"]
   merge = "override"