diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl
index 9346661e..4858b1ff 100644
--- a/home/.chezmoi.yaml.tmpl
+++ b/home/.chezmoi.yaml.tmpl
@@ -117,7 +117,6 @@ gpg:
 data:
   host:
     arch: "{{ .chezmoi.arch }}"
-    autoresticHealthcheckUuid: "AddInFromHealthchecksDashboard"
     cloudflare:
       teamsOrg: "{{ $cloudflareTeamsOrg }}"
     cpu:
@@ -209,7 +208,6 @@ data:
     weatherZipCode: 07960
 diff:
   pager: delta
-  command: delta
   args: ["--paging", "never"]
 edit:
   command: "code"
diff --git a/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl b/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
index 65abcc07..a08e1566 100644
--- a/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
@@ -584,9 +584,9 @@ setHostname() {
   if [ -d /Applications ] && [ -d /System ]; then
     # Source: https://apple.stackexchange.com/questions/287760/set-the-hostname-computer-name-for-macos
     logg info 'Setting macOS hostname / local hostname / computer name'
-    sudo scutil --set HostName '{{ .host.hostname | replace .host.domain "" | replace "." "" }}.{{ .host.domain }}' && logg success 'Changed HostName to {{ .host.hostname | replace .host.domain "" | replace "." "" }}.{{ .host.domain }}'
-    sudo scutil --set LocalHostName '{{ .host.hostname | replace .host.domain "" | replace "." "" }}' && logg success 'Changed LocalHostName to {{ .host.hostname | replace .host.domain "" | replace "." "" }}'
-    sudo scutil --set ComputerName '{{ .host.hostname | replace .host.domain "" | replace "." "" }}' && logg success 'Changed ComputerName to {{ .host.hostname | replace .host.domain "" | replace "." "" }}'
+    logg info 'Changing HostName to {{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}.{{ .host.domain }}' && sudo scutil --set HostName '{{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}.{{ .host.domain }}' && logg info 'Changed HostName to {{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}.{{ .host.domain }}'
+    logg info 'Changing LocalHostName to {{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}' && sudo scutil --set LocalHostName '{{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}' && logg info 'Changed LocalHostName to {{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}'
+    logg info 'Changing ComputerName to {{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}' && sudo scutil --set ComputerName '{{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}' && logg info 'Changed ComputerName to {{ .host.hostname | replace .host.domain "" | replace "." "" | replace " " "" }}'
     logg info 'Flushing DNS cache'
     dscacheutil -flushcache
   elif [ -f /etc/passwd ]; then
diff --git a/home/.chezmoitemplates/darwin/Brewfile b/home/.chezmoitemplates/darwin/Brewfile
index 3273d2ff..5feeefa4 100644
--- a/home/.chezmoitemplates/darwin/Brewfile
+++ b/home/.chezmoitemplates/darwin/Brewfile
@@ -3,7 +3,6 @@
 
 # Standard Homebrew taps
 tap "homebrew/cask-versions" # Initially added to support "visual-studio" cask
-tap "homebrew/core"
 tap "homebrew/bundle"
 
 if OS.mac?
@@ -27,6 +26,7 @@ brew "jq"
 brew "moreutils"
 brew "node"
 brew "progress"
+brew "python@2"
 brew "python@3.11"
 brew "ruby"
 tap "go-task/tap"