diff --git a/roles/munin_client/tasks/main.yml b/roles/munin_client/tasks/main.yml
index 9c115ab..7ebe2da 100644
--- a/roles/munin_client/tasks/main.yml
+++ b/roles/munin_client/tasks/main.yml
@@ -48,7 +48,7 @@
     dest: /etc/munin/plugins/apt_all
     state: link
   notify: munin
-  when: ansible_facts['distribution'] == "Debian"
+  when: ansible_facts["distribution"] == "Debian" and ansible_facts["distribution_release"] == "bullseye"
 
 - name: Remove native munin apt update
   # It does not work on Ubuntu, it's giving:
@@ -56,7 +56,7 @@
   # E: The value 'testing' is invalid for APT::Default-Release as such a release is not available in the sources
   # E: The value 'unstable' is invalid for APT::Default-Release as such a release is not available in the sources
   file:
-    path: /usr/share/munin/plugins/apt_all
+    path: /etc/munin/plugins/apt_all
     state: absent
   notify: munin
-  when: ansible_facts['distribution'] == "Ubuntu"
+  when: not(ansible_facts["distribution"] == "Debian" and ansible_facts["distribution_release"] == "bullseye")