diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index eb771e161..c09aa03ba 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -3,16 +3,16 @@
 # RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST
 - name: Install Calibre via calibre-installer.py (redhat, ubuntu, debian if NOT calibre_debs_on_debian)
   include_tasks: py-installer.yml
-  when: is_redhat or (is_ubuntu and not is_ubuntu_18) or (is_debian and not calibre_debs_on_debian)
+  when: is_redhat or is_ubuntu or (is_debian and not calibre_debs_on_debian)
   #when: not is_rpi
 
 - name: Install Calibre via .debs (Raspbian, Debian if calibre_debs_on_debian)
   include_tasks: debs.yml
   when: is_rpi or (is_debian and calibre_debs_on_debian)
 
-- name: Install Calibre via .debs (Ubuntu 18.xx)
-  include_tasks: debs.yml
-  when: is_ubuntu_18
+#- name: Install Calibre via .debs (Ubuntu 18.xx)
+#  include_tasks: debs.yml
+#  when: is_ubuntu_18
 
 - name: Create calibre-serve.service and calibre.conf
   template: