diff --git a/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl
index 34e738ba..3db46d28 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_45-vmware.tmpl
@@ -56,12 +56,25 @@ if command -v vmware > /dev/null; then
       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'
+    if [[ ! "$(grep Microsoft /proc/version)" ]]; then
+      ### Start / enable VMWare service
+      logg info 'Ensuring `vmware.service` is enabled and running'
+      sudo systemctl enable vmware.service
+      sudo systemctl restart vmware.service
+
+      ### Start / enable VMWare Workstation Server service
+      logg info 'Ensuring `vmware-workstation-server.service` is enabled and running'
+      sudo systemctl enable vmware-workstation-server.service
+      sudo systemctl restart vmware-workstation-server.service
+
+      ### Start / enable VMWare USB Arbitrator service
+      if command -v vmware-usbarbitrator.service > /dev/null; then
+        logg info 'Ensuring `vmware-usbarbitrator.service` is enabled and running'
+        sudo systemctl enable vmware-usbarbitrator.service
+        sudo systemctl restart vmware-usbarbitrator.service
+      else
+        logg warn '`vmware-usbarbitrator` does not exist in the PATH'
+      fi
     fi
   else
     logg info 'VMware host modules are present'
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_46_virtualbox.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_46_virtualbox.tmpl
index 61f1d9aa..78686692 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_46_virtualbox.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_46_virtualbox.tmpl
@@ -7,7 +7,7 @@
 ### Run logic if VirtualBox is installed
 if command -v VirtualBox > /dev/null; then
   ### Install VirtualBox extension pack if it is not installed already
-  if [[ ! -d /usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack/ ]]; then
+  if [ ! -d /usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack ]; then
     logg info 'Acquiring VirtualBox version information'
     VBOX_VERSION="$(VirtualBox --help | head -n 1 | cut -f 6 -d' ')"
     VBOX_VERSION="${VBOX_VERSION//v}"