diff --git a/private_dot_ssh/private_authorized_keys.tmpl b/private_dot_ssh/private_authorized_keys.tmpl
index ee3bdf5..46f3287 100644
--- a/private_dot_ssh/private_authorized_keys.tmpl
+++ b/private_dot_ssh/private_authorized_keys.tmpl
@@ -1 +1 @@
-{{- bitwardenAttachment "selfhosted.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0" }}
+{{- bitwardenAttachment "selfhosted.pub" "selfhosted-ssh-keys" }}
diff --git a/private_dot_ssh/private_config.tmpl b/private_dot_ssh/private_config.tmpl
index 77ce5f5..731e5a5 100644
--- a/private_dot_ssh/private_config.tmpl
+++ b/private_dot_ssh/private_config.tmpl
@@ -1,9 +1,10 @@
 Host *
   ForwardAgent yes
+  AddKeysToAgent yes
 
 Host penguincoder.org
   Port 2223
-  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   IdentityFile ~/.ssh/selfhosted
 
 Host git.penguincoder.org
@@ -13,15 +14,15 @@ Host git.penguincoder.org
   ProxyCommand none
 
 Host helium.penguincoder.org helium
-  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   HostName 192.168.1.50
 
 Host hydrogen hydrogen.olympus
-  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   HostName 192.168.1.80
 
 Host potassium potassium.olympus
-  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   HostName 192.168.1.60
   ProxyCommand none
 
diff --git a/private_dot_ssh/private_gitea.pub.tmpl b/private_dot_ssh/private_gitea.pub.tmpl
index 4ce8d3f..4905faa 100644
--- a/private_dot_ssh/private_gitea.pub.tmpl
+++ b/private_dot_ssh/private_gitea.pub.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "gitea.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
+{{- (bitwardenAttachment "gitea.pub" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_gitea.tmpl b/private_dot_ssh/private_gitea.tmpl
index f58313f..d787c86 100644
--- a/private_dot_ssh/private_gitea.tmpl
+++ b/private_dot_ssh/private_gitea.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "gitea" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
+{{- (bitwardenAttachment "gitea" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_github.pub.tmpl b/private_dot_ssh/private_github.pub.tmpl
index 3213c2a..cad3f66 100644
--- a/private_dot_ssh/private_github.pub.tmpl
+++ b/private_dot_ssh/private_github.pub.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "github.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
+{{- (bitwardenAttachment "github.pub" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_github.tmpl b/private_dot_ssh/private_github.tmpl
index 53dc99b..a9b8f8b 100644
--- a/private_dot_ssh/private_github.tmpl
+++ b/private_dot_ssh/private_github.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "github" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
+{{- (bitwardenAttachment "github" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_selfhosted.pub.tmpl b/private_dot_ssh/private_selfhosted.pub.tmpl
index 4e146be..bfc83cd 100644
--- a/private_dot_ssh/private_selfhosted.pub.tmpl
+++ b/private_dot_ssh/private_selfhosted.pub.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "selfhosted.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
+{{- (bitwardenAttachment "selfhosted.pub" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_selfhosted.tmpl b/private_dot_ssh/private_selfhosted.tmpl
index 638bd2a..ae65de9 100644
--- a/private_dot_ssh/private_selfhosted.tmpl
+++ b/private_dot_ssh/private_selfhosted.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "selfhosted" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
+{{- (bitwardenAttachment "selfhosted" "selfhosted-ssh-keys") -}}