diff --git a/tasks/additional-firmware.yml b/tasks/additional-firmware.yml
index fb099a1..9cbe8bd 100644
--- a/tasks/additional-firmware.yml
+++ b/tasks/additional-firmware.yml
@@ -6,7 +6,7 @@
 # line: 'GRUB_CMDLINE_LINUX_DEFAULT="quiet"'
     line: 'GRUB_CMDLINE_LINUX_DEFAULT="quiet nouveau.modeset=0"'
   register: grubfix
-  when: "'Thinkpad' in ansible_local['cpu_info']['productname']"
+  when: "'ThinkPad' in ansible_local['cpu_info']['productname']"
 
 - name: Update grub # noqa: no-handler
   ansible.builtin.command: update-grub
@@ -28,8 +28,20 @@
     state: present
   when: "'proxmox_servers' not in group_names"
 
-- name: Install intel-microcode on Intel systems, but only if this is a non-libreboot system
+- name: Inform user of the intention with the microcode package
+  ansible.builtin.debug:
+    msg: "This is an Intel system, but it is a libreboot system. Removing intel-microcode package."
+  when: "'GenuineIntel' in ansible_facts['processor'] and 'installed' in ansible_local['cpu_info']['libreboot']"
+
+- name: Remove intel-microcode on Intel libreboot systems
+  ansible.builtin.apt:
+    name: intel-microcode
+    state: absent
+    purge: true
+  when: "'GenuineIntel' in ansible_facts['processor'] and 'installed' in ansible_local['cpu_info']['libreboot']"
+
+- name: Install intel-microcode on Intel non-libreboot systems
   ansible.builtin.apt:
     name: intel-microcode
     state: present
-  when: ansible_facts['ansible_processor'][0] == 'Intel' and 'installed' not in ansible_local['cpu_info']['libreboot']
+  when: "'GenuineIntel' in ansible_facts['processor'] and 'installed' not in ansible_local['cpu_info']['libreboot']"
diff --git a/tasks/main.yml b/tasks/main.yml
index 2eafbef..8993ca1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,6 +15,10 @@
 - name: Import custom fact setting
   ansible.builtin.import_tasks: custom-fact.yml
 
+- name: Display custom facts from /etc/ansible/facts.d
+  ansible.builtin.debug:
+    var: ansible_local['cpu_info']
+
 - name: Firmware block for x86_64 systems
   when: "'Dell' in ansible_board_vendor or 'LENOVO' in ansible_board_vendor"
   block: