diff --git a/.chezmoiignore b/.chezmoiignore
index ad5a409..90f4c17 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -1,6 +1,6 @@
 README.md
 
-{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (eq .chezmoi.hostname "UGCB2YBS33") (eq .chezmoi.hostname "UGC1C4PJF24") (eq .chezmoi.hostname "UGC1C6Z2PC4") (env "ANDROID_ROOT") }}
+{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (hasPrefix "UGC" .chezmoi.hostname) (env "ANDROID_ROOT") }}
 .config/beets
 .config/davfs2/secrets
 .config/kitty
@@ -9,7 +9,7 @@ README.md
 .config/waybar
 {{ end }}
 
-{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (eq .chezmoi.hostname "UGCB2YBS33") (eq .chezmoi.hostname "UGC1C4PJF24") }}
+{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (hasPrefix "UGC" .chezmoi.hostname) }}
 .local/share/gnupg/sshcontrol
 {{ end }}
 
diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl
index f72d299..518d092 100644
--- a/dot_config/git/config.tmpl
+++ b/dot_config/git/config.tmpl
@@ -2,7 +2,7 @@
   autocrlf = input
   safecrlf = warn
 [user]
-{{- if eq .chezmoi.hostname "UGC13335X84" }}
+{{- if hasPrefix "UGC" .chezmoi.hostname }}
   email = jbeckmey@ford.com
 {{- else }}
   email = joel@beckmeyer.us