diff --git a/tasks/centos.yml b/tasks/centos.yml
index 3ab73166e0868432b10b6be399108a7f23bbfeb3..d842065a21a47a28921d150d15913acd4cc8f50a 100644
--- a/tasks/centos.yml
+++ b/tasks/centos.yml
@@ -20,7 +20,6 @@
       - tmux
       - curl
       - tcsh
-      - firefox
       - unzip
       - make
       - gcc
diff --git a/tasks/main.yml b/tasks/main.yml
index 737b58747e2620e5a68547f22b957fa92f4d5a99..5cf9bc57b7aeeffd8df7f4f499937fd399bb16f0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,10 @@
 ---
-# tasks file for basics
-- include: debian.yml tags=debian
-  when: ansible_os_family == 'Debian'
+
+- include: ubuntu.yml tags=debian
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "18"
+
+- include: ubuntu.yml tags=debian
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "20"
 
 - include: centos.yml tags=centos
-  when: ansible_distribution == "CentOS"
\ No newline at end of file
+  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
diff --git a/tasks/debian.yml b/tasks/ubuntu.yml
similarity index 97%
rename from tasks/debian.yml
rename to tasks/ubuntu.yml
index 17ae1f3d26612cd1db9282a9396b31fa8ceb8c31..fcc4644498977fbf87f1246df4c1631a22b2ef2c 100644
--- a/tasks/debian.yml
+++ b/tasks/ubuntu.yml
@@ -21,7 +21,6 @@
       - vim
       - nmon
       - tcsh
-      - firefox
       - eom
       - unzip
       - make