diff --git a/group_vars/all.yml b/group_vars/all.yml
index da8ef98f..20490a18 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -222,6 +222,7 @@ munin_node_disabled_plugins:
   - squid_traffic # proxmox
   - timesync
   - docker_volumesize2
+  - cpu_by_group
   - docker_multi
 
 munin_node_plugins:
@@ -246,11 +247,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
 
 ### mgrote_sync (für pbs + pve)
 rsync_mirror_user_group: "{{ rsync_mirror_user }}"
diff --git a/group_vars/blocky.yml b/group_vars/blocky.yml
index 7d235c7c..e592deac 100644
--- a/group_vars/blocky.yml
+++ b/group_vars/blocky.yml
@@ -113,11 +113,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: http://192.168.2.42:3000/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
   - name: dnsresponse_192.168.2.1
     src: http://192.168.2.42:3000/mirrors/munin-contrib/raw/branch/master/plugins/network/dns/dnsresponse_
   - name: dnsresponse_192.168.2.37
diff --git a/group_vars/docker.yml b/group_vars/docker.yml
index 28f9d3f3..67f3e487 100644
--- a/group_vars/docker.yml
+++ b/group_vars/docker.yml
@@ -112,11 +112,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
   - name: chrony
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony
   - name: docker_volumesize
diff --git a/group_vars/fileserver.yml b/group_vars/fileserver.yml
index c99b45d5..94df5466 100644
--- a/group_vars/fileserver.yml
+++ b/group_vars/fileserver.yml
@@ -49,11 +49,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
   - name: samba
     src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/samba
     config: |
diff --git a/group_vars/munin.yml b/group_vars/munin.yml
index 0a7fd087..8d87fb90 100644
--- a/group_vars/munin.yml
+++ b/group_vars/munin.yml
@@ -89,11 +89,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
   - name: mikrotik_system_rb5009
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/router/mikrotik_system
     config: |
diff --git a/group_vars/pbs.yml b/group_vars/pbs.yml
index 6167f151..6520ac76 100644
--- a/group_vars/pbs.yml
+++ b/group_vars/pbs.yml
@@ -59,11 +59,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
   - name: zfs_arcstats
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats
   - name: zfsonlinux_stats_
diff --git a/group_vars/pve.yml b/group_vars/pve.yml
index 7bf81bc1..c322cf5b 100644
--- a/group_vars/pve.yml
+++ b/group_vars/pve.yml
@@ -68,11 +68,6 @@ munin_node_plugins:
       env.client /usr/bin/fail2ban-client
       env.config_dir /etc/fail2ban
       user root
-  - name: cpu_by_group
-    src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/cpu/cpu_by_group
-    config: |
-      [cpu_by_group]
-      user root
   - name: zfs_arcstats
     src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats
   - name: zfsonlinux_stats_