diff --git a/home/.chezmoiremove b/home/.chezmoiremove
index db2e418f..1984d6e6 100644
--- a/home/.chezmoiremove
+++ b/home/.chezmoiremove
@@ -39,7 +39,6 @@ Brewfile
 .tmux.conf.local
 .v8flags*
 .vagrant.d/
-.viminfo
 .volta/
 .vscode-oss/
 .wgetrc
diff --git a/home/.chezmoiscripts/universal/run_after_24-cleanup.sh.tmpl b/home/.chezmoiscripts/universal/run_after_24-cleanup.sh.tmpl
index 4f291d45..ffd1f7fa 100644
--- a/home/.chezmoiscripts/universal/run_after_24-cleanup.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_after_24-cleanup.sh.tmpl
@@ -25,6 +25,12 @@ if [ -f "$HOME/.wget-hsts" ]; then
     rm -f "$HOME/.wget-hsts"
 fi
 
+### Remove .viminfo
+# No idea how this is being created
+if [ -f "$HOME/.viminfo" ]; then
+    sudo rm -f "$HOME/.viminfo"
+fi
+
 ### Remove .wrangler
 # Not sure how this is populating but the proper environment variables appear to be in place and nothing breaks when its removed
 if [ -d "$HOME/.wrangler" ]; then
diff --git a/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl b/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
index 4044dc4d..a76c35e5 100644
--- a/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
@@ -121,7 +121,7 @@ configureGPG() {
 disableDStoreFileCreation() {
   if command -v m > /dev/null; then
     logg info 'Disabling creation of .DS_Store files'
-    echo y | m dir dsfiles off
+    echo y | m dir dsfiles off > /dev/null
   fi
 }