diff --git a/home/.chezmoiscripts/universal/run_onchange_after_82-kasm-workspaces.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_82-kasm-workspaces.sh.tmpl
index d97feec2..5869b94e 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_82-kasm-workspaces.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_82-kasm-workspaces.sh.tmpl
@@ -1,4 +1,4 @@
-{{- if false -}}
+{{- if (ne .host.distro.family "windows") -}}
 #!/usr/bin/env bash
 # @file Kasm Workspaces
 # @brief Sets up cloud desktop server via Kasm Workspaces
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl
index 82332e00..87821815 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl
@@ -12,6 +12,8 @@
 {{ $removeShortcuts := join " " .removeLinuxShortcuts }}
 # shortcuts to remove: {{ $removeShortcuts }}
 
+logg info 'Processing remove shortcuts step for Linux machines'
+
 ### Remove unnecessary desktop shortcuts
 for DESKTOP_ICON in {{ $removeShortcuts }}; do
     for SHORTCUT_FOLDER in {{ .host.home }}/.local/share/applications {{ .host.home }}/.local/share/applications/wine/Programs; do
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl
index 83268caa..1d19bb8b 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl
@@ -171,6 +171,13 @@ if command -v warp-cli > /dev/null; then
 
     ### Python
     if command -v python3 > /dev/null; then
+        ### Ensure Certifi package is available globally
+        if ! pip3 list certifi | grep certifi > /dev/null; then
+            logg info 'Ensuring certifi is installed globally for Python 3'
+            pip3 install certifi
+        fi
+
+        ### Copy CloudFlare PEM file to Python 3 location
         logg info "Configuring python3 / python to use "$HOME/.local/etc/ssl/cloudflare/Cloudflare_CA.pem""
         echo | cat - "$HOME/.local/etc/ssl/cloudflare/Cloudflare_CA.pem" >> $(python3 -m certifi)
     fi
diff --git a/home/.chezmoiscripts/universal/run_onchange_before_09-node-version.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_09-node-version.sh.tmpl
index 7c585be2..0649f478 100644
--- a/home/.chezmoiscripts/universal/run_onchange_before_09-node-version.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_before_09-node-version.sh.tmpl
@@ -19,6 +19,8 @@ if command -v volta > /dev/null; then
   if ! test "$(node --version | sed 's/^v//' | awk '{print $1}' | awk -F'.' ' ( $1 > 15) ')"; then
     logg info 'Installing latest version of Node.js'
     volta install node@latest
+    logg info 'Ensuring NPM is updated to latest'
+    npm install -g npm@latest
   else
     logg info 'Node.js appears to meet the minimum version requirements (version >15)'
   fi