diff --git a/home/.chezmoiscripts/universal/run_before_01-install-homebrew.sh.tmpl b/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl
similarity index 94%
rename from home/.chezmoiscripts/universal/run_before_01-install-homebrew.sh.tmpl
rename to home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl
index cc1a1394..5bf9fc24 100644
--- a/home/.chezmoiscripts/universal/run_before_01-install-homebrew.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl
@@ -14,6 +14,11 @@
 {{ includeTemplate "universal/profile-before" }}
 {{ includeTemplate "universal/logg-before" }}
 
+### System upgrade on macOS
+if [ -d /Applications ] && [ -d /Library ]; then
+  sudo softwareupdate -i -a
+fi
+
 ### Install Xcode CLI tools on macOS
 if [ -d /Applications ] && [ -d /Library ]; then
   xcode-select -p >/dev/null 2>&1 || sudo xcode-select --install
diff --git a/home/.chezmoitemplates/ssh/ssh-lab b/home/.chezmoitemplates/darwin/ssh-lab
similarity index 100%
rename from home/.chezmoitemplates/ssh/ssh-lab
rename to home/.chezmoitemplates/darwin/ssh-lab