diff --git a/roles/firefox/tasks/main.yml b/roles/firefox/tasks/main.yml
index 995ea6b..9371ddd 100644
--- a/roles/firefox/tasks/main.yml
+++ b/roles/firefox/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 - import_tasks: upstream.yml
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "22.04"
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int < 22
 
 - import_tasks: ppa.yml
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "22.04"
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 22
 
 - import_tasks: update-alternatives.yml
\ No newline at end of file