diff --git a/docker-compose/munin/docker-compose.yml.j2 b/docker-compose/munin/docker-compose.yml.j2
index a0899ccb..2f2b5d90 100644
--- a/docker-compose/munin/docker-compose.yml.j2
+++ b/docker-compose/munin/docker-compose.yml.j2
@@ -24,8 +24,9 @@ services:
         pbs.mgrote.net:pbs.mgrote.net
         blocky.mgrote.net:blocky.mgrote.net
         ldap.mgrote.net:ldap.mgrote.net
+        munin-container:localhost
       # z.B.
-      # computer-test.mgrote.net.test:192.68.2.4
+      # computer-test.mgrote.net:192.68.2.4
       # computer.mgrote.net:computer.mgrote.net
     volumes:
       - db:/var/lib/munin
diff --git a/group_vars/all.yml b/group_vars/all.yml
index ada59d7d..0b25b2a8 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -203,15 +203,21 @@ munin_node_bind_host: "0.0.0.0"
 munin_node_bind_port: "4949"
 munin_node_allowed_cidrs: [192.168.2.0/24]
 munin_node_disabled_plugins:
-  - name: meminfo # zu hohe last
-  - name: hddtemp2 # ersetzt durch hddtemp_smartctl
-  - name: ntp # verursacht zu viele dns ptr request
-  - name: hddtempd # ersetzt durch hddtemp_smartctl
-  - name: squid_cache # proxmox
-  - name: squid_objectsize # proxmox
-  - name: squid_requests # proxmox
-  - name: squid_traffic # proxmox
-  - name: timesync
+  - meminfo # zu hohe last
+  - hddtemp2 # ersetzt durch hddtemp_smartctl
+  - ntp # verursacht zu viele dns ptr request
+  - hddtempd # ersetzt durch hddtemp_smartctl
+  - squid_cache # proxmox
+  - squid_objectsize # proxmox
+  - squid_requests # proxmox
+  - squid_traffic # proxmox
+  - timesync
+  - docker_volumesize2
+  - docker_containers
+  - docker_cpu
+  - docker_volumes
+  - docker_memory
+  - docker_network
 munin_node_plugins:
   - name: chrony
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony
diff --git a/group_vars/docker.yml b/group_vars/docker.yml
index a871490f..fa6d7a81 100644
--- a/group_vars/docker.yml
+++ b/group_vars/docker.yml
@@ -103,24 +103,17 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: docker_containers
+  - name: chrony
+    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony
+  - name: docker_multi
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_
     config: |
       [docker_*]
-      user root
+      group docker
       env.DOCKER_HOST unix://run/docker.sock
-  - name: docker_cpu
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_
-  - name: docker_memory
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_
-  - name: docker_network
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_
-  - name: docker_volumes
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_
+      env.EXCLUDE_CONTAINER_NAME wp
   - name: docker_volumesize
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize
-  - name: chrony
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony
 
 ### oefenweb.ufw
 ufw_rules: