diff --git a/tasks/main.yml b/tasks/main.yml
index f294fb706ddf959ed4b33ab420e93e03c4be814f..5cf9bc57b7aeeffd8df7f4f499937fd399bb16f0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,8 +1,10 @@
 ---
-# tasks file for ansible_ansys
 
-- 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 100%
rename from tasks/debian.yml
rename to tasks/ubuntu.yml