diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml
index 837a2dfb4..140841bbc 100644
--- a/roles/9-local-addons/tasks/main.yml
+++ b/roles/9-local-addons/tasks/main.yml
@@ -6,9 +6,10 @@
 - name: INTERNETARCHIVE
   include_role:
     name: internetarchive
+  when: internetarchive_install | bool
   #tags: internetarchive
 
-# Is porting to Python 3 complete?
+# Is porting to Python 3 complete, and if so does this belong elsewhere?
 - name: CAPTIVE PORTAL
   include_tasks: roles/captiveportal/tasks/main.yml
   when: captiveportal_install | bool
@@ -17,17 +18,20 @@
 - name: MINETEST
   include_role:
     name: minetest
+  when: minetest_install | bool
   #tags: minetest
 
 # KEEP AT THE END as this installs dependencies from Debian's 'testing' branch!
 - name: CALIBRE
   include_role:
     name: calibre
+  when: calibre_install | bool
   #tags: calibre
 
 - name: CALIBRE-WEB
   include_role:
     name: calibre-web
+  when: calibreweb_install | bool
   #tags: calibre-web
 
 # Could split these two below to Stage 10?