diff --git a/tasks/main.yml b/tasks/main.yml
index e1f1069..8e7dfc4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,9 @@
 ---
 
-- include_tasks: password.yml
+- import_tasks: password.yml
+  when: not root_target_directory is defined
 
-- include_tasks: ssh.yml
+- import_tasks: ssh.yml
 
-- include_tasks: fish.yml
+- import_tasks: fish.yml
+  when: not root_target_directory is defined
diff --git a/tasks/password.yml b/tasks/password.yml
index 78a054d..c0955bb 100644
--- a/tasks/password.yml
+++ b/tasks/password.yml
@@ -4,6 +4,4 @@
   user:
     name: root
     password: "{{ root_password }}"
-  when:
-    - root_password is defined
-    - not root_target_directory is defined
+  when: root_password is defined