diff --git a/CHANGELOG.md b/CHANGELOG.md
index 067a2bf2..e76f05ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,9 +17,11 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * vrrp: add an `ip.yml` task file to help create VRRP addresses
 * webapps/nextcloud: Add compatibility with apache2, and apache2 mod_php.
 * memcached: NRPE check for multi-instance setup
+* munin: Add ipmi_ plugins on dedicated hardware
 * proftpd: Add options to override configs (and add a warning if file was overriden)
 * proftpd: Allow user auth with ssh keys
 
+
 ### Changed
 
 * evocheck: upstream release 22.09
diff --git a/munin/tasks/main.yml b/munin/tasks/main.yml
index 4720fbe5..a4ea9a49 100644
--- a/munin/tasks/main.yml
+++ b/munin/tasks/main.yml
@@ -1,12 +1,13 @@
 ---
 
-- name: Ensure that Munin is installed
+- name: Ensure that Munin (and useful dependencies) is installed
   apt:
     name:
       - munin
       - munin-node
       - munin-plugins-core
       - munin-plugins-extra
+      - gawk
     state: present
   tags:
     - munin
@@ -79,16 +80,32 @@
   tags:
     - munin
 
-- name: Enable sensors plugin unless VM detected
+- name: Enable sensors_ plugin on dedicated hardware
   file:
     src: /usr/share/munin/plugins/sensors_
-    dest: /etc/munin/plugins/sensors_temp
+    dest: "/etc/munin/plugins/sensors_{{ item }}"
     state: link
-  when: ansible_virtualization_role != "guest"
+  with_items: 
+    - fan
+    - temp
+  when: ansible_virtualization_role == "host"
   notify: restart munin-node
   tags:
     - munin
 
+- name: Enable ipmi_ plugin on dedicated hardware
+  file:
+    src: /usr/share/munin/plugins/ipmi_
+    dest: "/etc/munin/plugins/ipmi_{{ item }}"
+    state: link
+  when: ansible_virtualization_role == "host"
+  notify: restart munin-node
+  with_items:
+    - fans
+    - temp
+    - power
+    - volts
+
 - name: adjustments for grsec kernel
   blockinfile:
     dest: /etc/munin/plugin-conf.d/munin-node