diff --git a/home/.chezmoiscripts/universal/run_onchange_after_25-gnome-extension-settings.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_19-gnome-extension-settings.tmpl
similarity index 100%
rename from home/.chezmoiscripts/universal/run_onchange_after_25-gnome-extension-settings.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_after_19-gnome-extension-settings.tmpl
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl
index 8b55a8a5..34e738ba 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl
@@ -8,6 +8,7 @@
 if command -v vmware > /dev/null; then
   ### Build kernel modules if they are not present
   if [ ! -f "/lib/modules/$(uname -r)/misc/vmmon.ko" ] || [ ! -f "/lib/modules/$(uname -r)/misc/vmnet.ko" ]; then
+    ### Build VMWare host modules
     logg info 'Building VMware host modules'
     if sudo vmware-modconfig --console --install-all; then
       logg success 'Built VMWare host modules successfully with `sudo vmware-modconfig --console --install-all`'
@@ -54,6 +55,14 @@ if command -v vmware > /dev/null; then
     else
       logg info '/usr/lib/vmware/isoimages/darwin.iso is already present on the system so VMware macOS unlocking will not be performed'
     fi
+
+    ### Start / enable VMWare USB Arbitrator
+    if command -v vmware-usbarbitrator.service > /dev/null; then
+      sudo systemctl enable vmware-usbarbitrator.service
+      sudo systemctl restart vmware-usbarbitrator.service
+    else
+      logg warn '`vmware-usbarbitrator` does not exist in the PATH'
+    fi
   else
     logg info 'VMware host modules are present'
   fi
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl
index e79df726..051ef25b 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl
@@ -49,10 +49,10 @@ if command -v rclone > /dev/null; then
 
         ### Add user Rclone mount
         logg info 'Adding user S3 rclone mount (available at ~/.local/mnt/s3)'
-        sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/s3-user.service" "/etc/systemd/system/${USER}-s3.service"
+        sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/s3-user.service" "/etc/systemd/system/s3-${USER}.service"
         logg info 'Enabling / restarting the S3 user mount'
-        sudo systemctl enable "${USER}-s3"
-        sudo systemctl restart "${USER}-s3"
+        sudo systemctl enable "s3-${USER}"
+        sudo systemctl restart "s3-${USER}"
     fi
 else
     logg info '`rclone` is not available'