diff --git a/roles/base/tasks/users/configure_ssh_client.yml b/roles/base/tasks/users/setup_ssh/configure_ssh_client.yml
similarity index 100%
rename from roles/base/tasks/users/configure_ssh_client.yml
rename to roles/base/tasks/users/setup_ssh/configure_ssh_client.yml
diff --git a/roles/base/tasks/users/install_known_hosts.yml b/roles/base/tasks/users/setup_ssh/install_known_hosts.yml
similarity index 100%
rename from roles/base/tasks/users/install_known_hosts.yml
rename to roles/base/tasks/users/setup_ssh/install_known_hosts.yml
diff --git a/roles/base/tasks/users/install_private_keys.yml b/roles/base/tasks/users/setup_ssh/install_private_keys.yml
similarity index 100%
rename from roles/base/tasks/users/install_private_keys.yml
rename to roles/base/tasks/users/setup_ssh/install_private_keys.yml
diff --git a/roles/base/tasks/users/install_public_keys.yml b/roles/base/tasks/users/setup_ssh/install_public_keys.yml
similarity index 100%
rename from roles/base/tasks/users/install_public_keys.yml
rename to roles/base/tasks/users/setup_ssh/install_public_keys.yml