diff --git a/private_dot_ssh/private_authorized_keys.tmpl b/private_dot_ssh/private_authorized_keys.tmpl
index 4f63112..ee3bdf5 100644
--- a/private_dot_ssh/private_authorized_keys.tmpl
+++ b/private_dot_ssh/private_authorized_keys.tmpl
@@ -1,7 +1 @@
-{{- if (eq .chezmoi.hostname "hydrogen") -}}
-{{ (bitwardenAttachment "hydrogen.pub" "selfhosted-ssh-keys") }}
-{{- else if (hasSuffix "freebsd" .chezmoi.hostname) -}}
-{{ (bitwardenAttachment "hydrogen.pub" "selfhosted-ssh-keys") }}
-{{- else if (eq .chezmoi.hostname "lithium") -}}
-{{ (bitwardenAttachment "lithium.pub" "selfhosted-ssh-keys") }}
-{{- end -}}
+{{- bitwardenAttachment "selfhosted.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0" }}
diff --git a/private_dot_ssh/private_bluehost-waldenfarmshoa.pub.tmpl b/private_dot_ssh/private_bluehost-waldenfarmshoa.pub.tmpl
deleted file mode 100644
index 9b26d08..0000000
--- a/private_dot_ssh/private_bluehost-waldenfarmshoa.pub.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "bluehost-waldenfarmshoa.pub" "thewaldenfarms.com-ssh-keys") -}}
diff --git a/private_dot_ssh/private_bluehost-waldenfarmshoa.tmpl b/private_dot_ssh/private_bluehost-waldenfarmshoa.tmpl
deleted file mode 100644
index 3ee6ab2..0000000
--- a/private_dot_ssh/private_bluehost-waldenfarmshoa.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "bluehost-waldenfarmshoa" "thewaldenfarms.com-ssh-keys") -}}
diff --git a/private_dot_ssh/private_config.tmpl b/private_dot_ssh/private_config.tmpl
index 5e2ba66..77ce5f5 100644
--- a/private_dot_ssh/private_config.tmpl
+++ b/private_dot_ssh/private_config.tmpl
@@ -1,30 +1,33 @@
-Include consolo.services.d/*.conf
-
 Host *
   ForwardAgent yes
 
 Host penguincoder.org
   Port 2223
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").lithium_username.value }}
-  IdentityFile ~/.ssh/lithium
+  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  IdentityFile ~/.ssh/selfhosted
 
 Host git.penguincoder.org
   Port 2222
   User git
   IdentityFile ~/.ssh/gitea
+  ProxyCommand none
 
-Host lithium lithium.olympus
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").lithium_username.value }}
-  IdentityFile ~/.ssh/lithium
+Host helium.penguincoder.org helium
+  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  HostName 192.168.1.50
 
 Host hydrogen hydrogen.olympus
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
-  IdentityFile ~/.ssh/hydrogen
+  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  HostName 192.168.1.80
 
-Host unifi
-  HostName 192.168.1.97
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").unifi_username.value }}
-  IdentityFile ~/.ssh/lithium
+Host potassium potassium.olympus
+  User {{ (bitwardenFields "item" "b4c098e4-88a1-4b41-819c-cedc90088de0").hydrogen_username.value }}
+  HostName 192.168.1.60
+  ProxyCommand none
+
+Host *.penguincoder.org !git.penguincoder.org
+  IdentityFile ~/.ssh/selfhosted
+  ProxyCommand ssh -W %h:%p penguincoder.org -p 2223
 
 Host github.com
   User git
@@ -35,6 +38,3 @@ Host jolijardin.co
   PubKeyAuthentication no
   # {{ (bitwardenFields "item" "jolijardin.co").password.value }}
 
-Host thewaldenfarms.com
-  User {{ (bitwardenFields "item" "thewaldenfarms.com-ssh-keys").username.value }}
-  IdentityFile ~/.ssh/bluehost-waldenfarmshoa
diff --git a/private_dot_ssh/private_consolo.services.d/private_aws-devops.pub.tmpl b/private_dot_ssh/private_consolo.services.d/private_aws-devops.pub.tmpl
deleted file mode 100644
index 96b9fa9..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_aws-devops.pub.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "aws-devops.pub" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_aws-devops.tmpl b/private_dot_ssh/private_consolo.services.d/private_aws-devops.tmpl
deleted file mode 100644
index 4d5789a..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_aws-devops.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "aws-devops" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_aws-prod.pub.tmpl b/private_dot_ssh/private_consolo.services.d/private_aws-prod.pub.tmpl
deleted file mode 100644
index 96b9fa9..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_aws-prod.pub.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "aws-devops.pub" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_aws-prod.tmpl b/private_dot_ssh/private_consolo.services.d/private_aws-prod.tmpl
deleted file mode 100644
index ec88140..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_aws-prod.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "aws-prod" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_aws-sigma.pub.tmpl b/private_dot_ssh/private_consolo.services.d/private_aws-sigma.pub.tmpl
deleted file mode 100644
index fc0b87b..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_aws-sigma.pub.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "aws-sigma.pub" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_aws-sigma.tmpl b/private_dot_ssh/private_consolo.services.d/private_aws-sigma.tmpl
deleted file mode 100644
index 32527b9..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_aws-sigma.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "aws-sigma" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_devops.conf.tmpl b/private_dot_ssh/private_consolo.services.d/private_devops.conf.tmpl
deleted file mode 100644
index 4fdb5c2..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_devops.conf.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "devops.conf" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_nonprod.conf.tmpl b/private_dot_ssh/private_consolo.services.d/private_nonprod.conf.tmpl
deleted file mode 100644
index 5b2c09f..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_nonprod.conf.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "nonprod.conf" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_peak10.conf.tmpl b/private_dot_ssh/private_consolo.services.d/private_peak10.conf.tmpl
deleted file mode 100644
index 6e018bf..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_peak10.conf.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "peak10.conf" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_consolo.services.d/private_prod-a.conf.tmpl b/private_dot_ssh/private_consolo.services.d/private_prod-a.conf.tmpl
deleted file mode 100644
index fd0b612..0000000
--- a/private_dot_ssh/private_consolo.services.d/private_prod-a.conf.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "prod-a.conf" "Wellsky-AWS") -}}
diff --git a/private_dot_ssh/private_gitea b/private_dot_ssh/private_gitea
deleted file mode 100644
index 1c4d5d7..0000000
--- a/private_dot_ssh/private_gitea
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-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
------END OPENSSH PRIVATE KEY-----
diff --git a/private_dot_ssh/private_gitea.pub.tmpl b/private_dot_ssh/private_gitea.pub.tmpl
index 4905faa..4ce8d3f 100644
--- a/private_dot_ssh/private_gitea.pub.tmpl
+++ b/private_dot_ssh/private_gitea.pub.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "gitea.pub" "selfhosted-ssh-keys") -}}
+{{- (bitwardenAttachment "gitea.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
diff --git a/private_dot_ssh/private_gitea.tmpl b/private_dot_ssh/private_gitea.tmpl
new file mode 100644
index 0000000..f58313f
--- /dev/null
+++ b/private_dot_ssh/private_gitea.tmpl
@@ -0,0 +1 @@
+{{- (bitwardenAttachment "gitea" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
diff --git a/private_dot_ssh/private_github.pub.tmpl b/private_dot_ssh/private_github.pub.tmpl
index cad3f66..3213c2a 100644
--- a/private_dot_ssh/private_github.pub.tmpl
+++ b/private_dot_ssh/private_github.pub.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "github.pub" "selfhosted-ssh-keys") -}}
+{{- (bitwardenAttachment "github.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
diff --git a/private_dot_ssh/private_github.tmpl b/private_dot_ssh/private_github.tmpl
index a9b8f8b..53dc99b 100644
--- a/private_dot_ssh/private_github.tmpl
+++ b/private_dot_ssh/private_github.tmpl
@@ -1 +1 @@
-{{- (bitwardenAttachment "github" "selfhosted-ssh-keys") -}}
+{{- (bitwardenAttachment "github" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
diff --git a/private_dot_ssh/private_hydrogen.pub.tmpl b/private_dot_ssh/private_hydrogen.pub.tmpl
deleted file mode 100644
index 734fb7a..0000000
--- a/private_dot_ssh/private_hydrogen.pub.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "hydrogen.pub" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_hydrogen.tmpl b/private_dot_ssh/private_hydrogen.tmpl
deleted file mode 100644
index c9a01be..0000000
--- a/private_dot_ssh/private_hydrogen.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "hydrogen" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_lithium.pub.tmpl b/private_dot_ssh/private_lithium.pub.tmpl
deleted file mode 100644
index 095bd7b..0000000
--- a/private_dot_ssh/private_lithium.pub.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "lithium.pub" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_lithium.tmpl b/private_dot_ssh/private_lithium.tmpl
deleted file mode 100644
index 755c0f5..0000000
--- a/private_dot_ssh/private_lithium.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{- (bitwardenAttachment "lithium" "selfhosted-ssh-keys") -}}
diff --git a/private_dot_ssh/private_selfhosted.pub.tmpl b/private_dot_ssh/private_selfhosted.pub.tmpl
new file mode 100644
index 0000000..4e146be
--- /dev/null
+++ b/private_dot_ssh/private_selfhosted.pub.tmpl
@@ -0,0 +1 @@
+{{- (bitwardenAttachment "selfhosted.pub" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}
diff --git a/private_dot_ssh/private_selfhosted.tmpl b/private_dot_ssh/private_selfhosted.tmpl
new file mode 100644
index 0000000..638bd2a
--- /dev/null
+++ b/private_dot_ssh/private_selfhosted.tmpl
@@ -0,0 +1 @@
+{{- (bitwardenAttachment "selfhosted" "b4c098e4-88a1-4b41-819c-cedc90088de0") -}}