diff --git a/roles/native-nextcloud-client/tasks/main.yml b/roles/native-nextcloud-client/tasks/main.yml
index 9a663e42..b826d060 100644
--- a/roles/native-nextcloud-client/tasks/main.yml
+++ b/roles/native-nextcloud-client/tasks/main.yml
@@ -17,3 +17,5 @@
     - Pictures
     - Music
     - Desktop
+    - Software
+    - Downloads
diff --git a/roles/native-nextcloud-client/vars/main.yml b/roles/native-nextcloud-client/vars/main.yml
index 4206e3b8..43a6b757 100644
--- a/roles/native-nextcloud-client/vars/main.yml
+++ b/roles/native-nextcloud-client/vars/main.yml
@@ -1,2 +1,2 @@
 user_home_directory: "/home/{{client_username}}/"
-cloud_directory: "{{user_home_directory}}Clouds/{{cloud_fqdn}}/"
+cloud_directory: "{{user_home_directory}}Clouds/{{cloud_fqdn}}/{{client_username}}/"