diff --git a/setup.sh b/setup.sh
index 10f33a4..3fa6816 100755
--- a/setup.sh
+++ b/setup.sh
@@ -399,21 +399,21 @@ main() {
 
 
     install_home_manager
+
     setup_symlinks
     setup_ansible
 
     # Get hostname
     local hostname
     hostname=$(cat "$HOME/.hostname") || die "Failed to read hostname"
-    
-    # Rebuild Home Manager
-    cd "$DOTFILES_DIR/config/home-manager" || die "Failed to change to home-manager config directory"
-    NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ALLOW_INSECURE=1 home-manager switch --extra-experimental-features flakes --extra-experimental-features nix-command --flake ".#$hostname" --impure -b backup || \
-        die "Failed to rebuild Home Manager"
+    export PATH=$PATH:$HOME/dotfiles/bin
 
     # 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. Please logout / restart to continue with 'dotf update'.\n"
     log_error "\n!!! Please logout / restart to continue !!!"