diff --git a/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl b/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl
index 503ad2fd..5fd5956c 100644
--- a/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl
@@ -6,6 +6,10 @@
 #     This script ensures macOS has tools like `git` by installing the Xcode command-line developer tools if they are
 #     not already installed. Then, on both Linux and macOS, it ensures Homebrew is installed.
 #
+#     ## Environment Variables
+#
+#     * `NO_RESTART` - Set this variable to skip restarts triggered by system updates on macOS
+#
 #     ## Homebrew Requirement
 #
 #     Install Doctor relies on Homebrew for many tools that are currently only available via Homebrew. Removing the dependency
@@ -48,7 +52,7 @@ if [ -d /Applications ] && [ -d /Library ] && [ -z "$NO_RESTART" ]; then
   if command -v gtimeout > /dev/null; then
     # Allow 8 minutes for system updates
     logg info 'Ensuring system software is upgraded (timing out after 8 minutes if system upgrade fails)'
-    sudo gtimeout 480 softwareupdate -i -a -R || logg warn 'The system update command timed out after 8 minutes'
+    sudo gtimeout 3000 softwareupdate -i -a -R || logg warn 'The system update command timed out after 50 minutes'
   else
     # If gtimeout is unavailable, then attempt system upgrade without a timeout (which usually works on fresh systems)
     logg info 'Applying OS upgrades (if available)'
diff --git a/software.yml b/software.yml
index c61637fe..0e2a0d98 100644
--- a/software.yml
+++ b/software.yml
@@ -10934,7 +10934,7 @@ softwarePlugins:
       - twitter
     update: steampipe plugin update --all
   teams:
-    cmd:
+    cmd: echo "Teams plugins are installed via the Teams app"
     plugins:
       - name: Pieces
         plugin: https://teams.microsoft.com/l/app/789f23b3-d882-45ca-b3a3-de7f850656ea
@@ -10962,11 +10962,12 @@ softwarePlugins:
       - GitHub.copilotvs
       - TemplateStudio.TemplateStudioForWinUICs
       - lepo.wpf-ui
-  vscode::
-    cmd: bash -c 'if ! code --list-extensions | grep "{PLUGIN}" > /dev/null; then code --install-extension "{PLUGIN}"; fi'
-    plugins:
-      - GitHub.copilot
-  vscodium:
-    cmd: bash -c 'if ! codium --list-extensions | grep "{PLUGIN}" > /dev/null; then codium --install-extension "{PLUGIN}"; fi'
-    plugins:
-      - GitHub.copilot
+  # Handled by script that looks at ~/.config/Code/extensions.json
+  # vscode:
+  #   cmd: bash -c 'if ! code --list-extensions | grep "{PLUGIN}" > /dev/null; then code --install-extension "{PLUGIN}"; fi'
+  #   plugins:
+  #     - GitHub.copilot
+  # vscodium:
+  #   cmd: bash -c 'if ! codium --list-extensions | grep "{PLUGIN}" > /dev/null; then codium --install-extension "{PLUGIN}"; fi'
+  #   plugins:
+  #     - GitHub.copilot