diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index 9e3ad4900..38e387902 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -77,7 +77,6 @@
 - name: SSHD
   include_role:
     name: sshd
-  #when: sshd_install | bool    # Flag might be created in future?
 
 - name: IIAB-ADMIN
   include_role:
diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index dd581f84a..52fb7a2d0 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -18,6 +18,10 @@
     name: pylibs
   #when: pylibs_install | bool    # Flag might be created in future?
 
+- name: SSHD
+  include_role:
+    name: sshd
+
 - name: Install named / BIND
   include_tasks: roles/network/tasks/named.yml
   when: named_install | bool
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index f6a7d77a1..784036092 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -208,7 +208,7 @@ wan_try_dhcp_before_static_ip: True   # Facilitate field updates w/ cablemodems
 # 1-PREP
 
 # SEE ssh_port var above.
-sshd_install: True    # 2020-01-21: do not rely on this var for now (might be implemented in future)
+sshd_install: True
 sshd_enabled: True
 
 # roles/iiab-admin runs here
diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index 6219ca273..86c722cff 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -168,6 +168,7 @@ apache_allow_sudo: True
 
 
 # 4-SERVER-OPTIONS
+sshd_enabled: True
 
 # DNS prep (dnsmasq, named &/or dhcpd) run here.  The full network stage runs
 # after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index ea57bc255..56c73486e 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -168,6 +168,7 @@ apache_allow_sudo: True
 
 
 # 4-SERVER-OPTIONS
+sshd_enabled: True
 
 # DNS prep (dnsmasq, named &/or dhcpd) run here.  The full network stage runs
 # after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index 2b1f0c96b..e897512a9 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -168,6 +168,7 @@ apache_allow_sudo: True
 
 
 # 4-SERVER-OPTIONS
+sshd_enabled: True
 
 # DNS prep (dnsmasq, named &/or dhcpd) run here.  The full network stage runs
 # after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")