diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index f4ee89a..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[user]
-	name = Ted Kulp
-	email = ted@tedkulp.com
-	gmail = tedkulp@gmail.com
-	signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895
-[commit]
-	# gpgsign = true
-[credential]
-	helper = osxkeychain
-[pull]
-	rebase = false
-[tag]
-	forceSignAnnotated = true
-[alias]
-	mdr = merge --no-commit --no-ff
-[init]
-	defaultBranch = main
diff --git a/.gitconfig##template b/.gitconfig##template
new file mode 100644
index 0000000..c6892f4
--- /dev/null
+++ b/.gitconfig##template
@@ -0,0 +1,36 @@
+[user]
+  name = Ted Kulp
+{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
+  email = ted@allocate.co
+  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsv4Cz+g1q93ifvEhSyMgE6mWiKacoLRKyHgWC7Vey7
+{% else %}
+  email = ted@tedkulp.com
+  gmail = tedkulp@gmail.com
+  signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895
+{% endif %}
+
+{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
+[gpg]
+  format = ssh
+
+[gpg "ssh"]
+  program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+{% endif %}
+
+[commit]
+  gpgsign = true
+
+[credential]
+  helper = osxkeychain
+
+[pull]
+ rebase = false
+
+[tag]
+  forceSignAnnotated = true
+
+[alias]
+  mdr = merge --no-commit --no-ff
+
+[init]
+  defaultBranch = main
diff --git a/.ssh/config b/.ssh/config
deleted file mode 100644
index 10cab31..0000000
--- a/.ssh/config
+++ /dev/null
@@ -1,2 +0,0 @@
-Host *
-	IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"