diff --git a/telegraf/base.conf b/telegraf/base.conf
index 3cc7672..6521635 100644
--- a/telegraf/base.conf
+++ b/telegraf/base.conf
@@ -39,6 +39,7 @@
 [[inputs.mem]]
 [[inputs.swap]]
 [[inputs.system]]
+  fieldexclude = ["uptime_format"]
 [[inputs.disk]]
   ignore_fs = ["tmpfs", "devtmpfs", "overlay", "squashfs", "fuse.lxcfs"]
 [[inputs.diskio]]
diff --git a/telegraf/docker.conf b/telegraf/docker.conf
index 286d157..e9c2641 100644
--- a/telegraf/docker.conf
+++ b/telegraf/docker.conf
@@ -1,6 +1,7 @@
 # Docker-Container: Stats + Logs (nur wenn /var/run/docker.sock existiert)
 [[inputs.docker]]
   endpoint = "unix:///var/run/docker.sock"
+  timeout = "20s"
   perdevice_include = []
   total_include = ["cpu", "blkio", "network"]
   docker_label_include = []
@@ -17,4 +18,4 @@
 
 [[processors.override]]
   namepass = ["docker_log"]
-  fielddrop = ["container_id"]
+  fieldexclude = ["container_id"]