diff --git a/roles/packages/tasks/Pop!_OS.yml b/roles/packages/tasks/Pop!_OS-22.04.yml
similarity index 100%
rename from roles/packages/tasks/Pop!_OS.yml
rename to roles/packages/tasks/Pop!_OS-22.04.yml
diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml
index a2c520f..13cf66b 100644
--- a/roles/packages/tasks/main.yml
+++ b/roles/packages/tasks/main.yml
@@ -1,10 +1,10 @@
 - name: Load a variable file based on the OS type
   include_vars: "{{ item }}"
   with_first_found:
-  - "vars/{{ ansible_os_family }}.yml"
   - "vars/{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
   - "vars/{{ ansible_distribution }}.yml"
+  - "vars/{{ ansible_os_family }}.yml"
   - "vars/defaults.yml"
 
 - name:
-  include_tasks: "{{ ansible_os_family }}.yml"
+  include_tasks: "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
diff --git a/roles/packages/vars/Pop!_OS.yml b/roles/packages/vars/Pop!_OS-22.04.yml
similarity index 100%
rename from roles/packages/vars/Pop!_OS.yml
rename to roles/packages/vars/Pop!_OS-22.04.yml