diff --git a/config/ansible/main.yml b/config/ansible/main.yml
index 6c2788b..d845827 100644
--- a/config/ansible/main.yml
+++ b/config/ansible/main.yml
@@ -2,6 +2,12 @@
   hosts: all
   gather_facts: true
 
+  pre_tasks:
+    - name: Install required collections
+      ansible.builtin.command: ansible-galaxy collection install -r requirements.yml
+      delegate_to: localhost
+      run_once: true
+
   tasks:
     - name: Include global tasks
       ansible.builtin.import_tasks: tasks/global/global.yml
diff --git a/config/ansible/requirements.yml b/config/ansible/requirements.yml
new file mode 100644
index 0000000..809084f
--- /dev/null
+++ b/config/ansible/requirements.yml
@@ -0,0 +1,4 @@
+---
+# Collections section
+collections:
+  - community.general
diff --git a/setup.sh b/setup.sh
index 7196aeb..b7ede79 100755
--- a/setup.sh
+++ b/setup.sh
@@ -387,12 +387,10 @@ main() {
     # Create setup marker
     touch "$SETUP_MARKER" || die "Failed to create setup marker"
 
-    # Initial run of dotf update
-    dotf update || die "Failed to run 'dotf update', please see the output for more information"
-
     # Final success message
-    log_success "\nSetup complete, it shouldn't be necessary but to be sure, please restart your shell.\n"
-    log_success "You can now run 'dotf' to manage your dotfiles.\n"
+    log_success "\nSetup complete. Please logout / restart to continue with 'dotf update'.\n"
+    log_error "\n!!! Please logout / restart to continue !!!"
+    log_error "~~~   Proceed by running 'dotf update'  ~~~\n"
 }
 
 main "$@"