diff --git a/run_once_01_install_packages.sh.tmpl b/run_once_01_install_packages.sh.tmpl
index d29b1e1..77eab02 100644
--- a/run_once_01_install_packages.sh.tmpl
+++ b/run_once_01_install_packages.sh.tmpl
@@ -7,9 +7,25 @@
             feh \
             git \
             zsh \
-            && true
+            ;
     {{ end }}
 
+    cargo install \
+        autojump \
+        bat \
+        cargo-edit \
+        cargo-expand \
+        cargo-tree \
+        cargo-update \
+        cargo-watch \
+        fd-find \
+        hexyl \
+        just \
+        ripgrep \
+        tokei \
+        {{ if .root }} topgrade {{ end }} \
+        ;
+
 {{ end }}
 
 # vim: set ft=bash :
diff --git a/run_once_02_cargo_bins.sh b/run_once_02_cargo_bins.sh
index 7a8289d..5abfb64 100755
--- a/run_once_02_cargo_bins.sh
+++ b/run_once_02_cargo_bins.sh
@@ -2,19 +2,4 @@
 
 # source $(dirname "$0")/common.sh
 
-cargo install \
-    autojump \
-    bat \
-    cargo-edit \
-    cargo-expand \
-    cargo-tree \
-    cargo-update \
-    cargo-watch \
-    fd-find \
-    hexyl \
-    just \
-    ripgrep \
-    tokei \
-    topgrade \
-    ;