diff --git a/CHANGELOG.md b/CHANGELOG.md
index b372d9e2..6f485f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
 * elasticsearch: add http.publish_host variable
 * evoacme: disable old certbot cron also in cron.daily
 * kibana: log messages go to /var/log/kibana/kibana.log
+* munin: properly rename Munin cache directory
 * mysql: add an option to install the client development  libraries (default: `False`)
 * java: support for Oracle JRE
 * nagios-nrpe: add check_postgrey
diff --git a/munin/tasks/main.yml b/munin/tasks/main.yml
index ae1644fe..0ca5eb29 100644
--- a/munin/tasks/main.yml
+++ b/munin/tasks/main.yml
@@ -22,7 +22,7 @@
     notify: restart munin-node
 
   - name: Rename the localdomain data dir
-    command: mv /var/lib/munin/localdomain /var/lib/munin/{{ ansible_domain }}
+    shell: mv /var/lib/munin/localdomain /var/lib/munin/{{ ansible_domain }} && rename "s/localhost.localdomain/{{ ansible_fqdn }}/" /var/lib/munin/{{ ansible_domain }}/*
     args:
       creates: /var/lib/munin/{{ ansible_domain }}
       removes: /var/lib/munin/localdomain