diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml
index faa050a35..ad9917fce 100644
--- a/roles/calibre/tasks/debs.yml
+++ b/roles/calibre/tasks/debs.yml
@@ -1,7 +1,11 @@
 - name: Start by installing OS's Calibre package
   package:
-    name: calibre
-    state: present
+    name: "{{ item }}"
+    state: latest
+  with_items:
+    - calibre
+    - calibre-bin
+  when: internet_available
 
 # April 5 2018 raspbian is now tracking the latest Calibre with a small delay.
 # Should you really want the latest just run the below script standalone, it is
@@ -9,12 +13,12 @@
 
 - name: Upgrade to testing Calibre - RPi
   command: scripts/calibre-install-latest-rpi.sh
-  when: is_rpi
+  when: is_rpi and internet_available
 
 - name: Upgrade to testing Calibre - non-RPi
   command: scripts/calibre-install-latest.sh
-  when: not is_rpi and not is_ubuntu_18
+  when: not is_rpi and not is_ubuntu_18 and internet_available
 
 - name: Upgrade to unstable Calibre -  all
   command: scripts/calibre-install-unstable.sh
-  when: calibre_unstable
+  when: calibre_unstable and internet_available