diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index fd977cc02..1759c5b7d 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -18,23 +18,25 @@
     name: pylibs
   #when: pylibs_install    # Flag might be created in future?
 
-# Also run by roles/1-prep/tasks/main.yml as required by OpenVPN.
-- name: SSHD
+- name: SSHD - also run by roles/1-prep/tasks/main.yml as required by OpenVPN
   include_role:
     name: sshd
   when: sshd_install
 
+# UNMAINTAINED
 - name: Install named / BIND
   include_tasks: roles/network/tasks/named.yml
-  when: named_install
+  when: named_install is defined and named_install
 
+# UNMAINTAINED
 - name: Install dhcpd
   include_tasks: roles/network/tasks/dhcpd.yml
-  when: dhcpd_install
+  when: dhcpd_install is defined and dhcpd_install
 
+# UNMAINTAINED
 - name: Install Squid (and DansGuardian if dansguardian_install)
   include_tasks: roles/network/tasks/squid.yml
-  when: squid_install
+  when: squid_install is defined and squid_install
 
 - name: Install Bluetooth - only on Raspberry Pi
   include_role: