update..

roles/common/tasks/apt.yml

@@ -65,7 +65,7 @@
     name: "{{ apt_initial_install_stretch }}"
     state: "{{ apt_install_state }}"
   when:
-    - - apt_initial_install_stretch is defined and apt_initial_install_stretch|length > 0
+    - apt_initial_install_stretch is defined and apt_initial_install_stretch|length > 0
     - ansible_facts['distribution'] == "Debian"
     - ansible_facts['distribution_major_version'] == "9"
   tags:
@@ -138,10 +138,11 @@
 
 - name: (apt.yml) Install CPU microcode (debian buster/bullseye)
   apt:
-    name: "{{ microcode_package }}"
+    name: "{{ microcode_intel_package }}"
     state: present
     default_release: "{{ ansible_distribution_release }}"
   when:
+    - apt_debian_contrib_nonfree_enable
     - ansible_facts['distribution'] == "Debian"
     - ansible_facts['distribution_major_version'] == "10" or ansible_facts['distribution_major_version'] == "11"
     - ansible_facts['processor']|string is search("Intel")
@@ -226,9 +227,21 @@
 # Firmware
 # ---
 
-- name: (apt.yml) Install Firmware packages
+- name: (apt.yml) Install Firmware packages (Ubuntu)
   apt:
-     name: "{{ firmware_packages }}"
+     name: "{{ firmware_packages_ubuntu }}"
+     state: present
+     default_release: "{{ ansible_distribution_release }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+  tags:
+    - apt-initial-install
+    - apt-firmware
+
+
+- name: (apt.yml) Install Firmware packages (Debian)
+  apt:
+     name: "{{ firmware_packages_debian }}"
      state: present
      default_release: "{{ ansible_distribution_release }}"
   when:
@@ -238,14 +251,14 @@
     - apt-firmware
 
 
-- name: (apt.yml) Install non-free Firmware packages
+- name: (apt.yml) Install non-free Firmware packages (Debian)
   apt:
-     name: "{{ firmware_non_free_packages }}"
+     name: "{{ firmware_non_free_packages_debian }}"
      state: present
      default_release: "{{ ansible_distribution_release }}"
   when:
-    - apt_debian_contrib_nonfree_enable
     - ansible_facts['distribution'] == "Debian"
+    - apt_debian_contrib_nonfree_enable
   tags:
     - apt-initial-install
     - apt-firmware