diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index 8ee85cd..9f0aa53 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -58,9 +58,9 @@
   shell: cat {{ ansible_user_dir }}/.ssh/id_rsa.pub
   register: sshkey
 
-- name: Enable root ssh login on nova-compute VM's
-  command: ansible {{ item }} -b -u ubuntu -m authorized_keys -a "user='root' key='{{ sshkey.stdout }}'"
-  with_items: "{{ head_vm_list | selectattr('service','nova-compute') | list }}"
+- name: Enable root ssh login on VM's that need it
+  command: ansible {{ item.name }} -b -u ubuntu -m authorized_keys -a "user='root' key='{{ sshkey.stdout }}'"
+  with_items: "{{ head_vm_list | selectattr('root_ssh_login', 'defined') | list }}"
 
 - name: Initialize Juju
   command: juju generate-config