diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index bb2a0da..4bceb33 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -8,6 +8,12 @@ Host *
     IdentityFile ~/.ssh/1904_powellc
     VerifyHostKeyDNS no
 
+Host github.com
+    ServerAliveInterval 300
+    ServerAliveCountMax 2
+    AddKeysToAgent yes
+    IdentityFile ~/.ssh/2022_git
+
 # Home Gitea account:
 Host code.unbl.ink git.service
   Port 222
@@ -17,6 +23,9 @@ Host code.unbl.ink git.service
   PasswordAuthentication no
   IdentitiesOnly yes
 
+Host gogs*
+  Port 222
+
 # Mailinabox uses root by default
 Host box.*
   User root
@@ -41,14 +50,21 @@ Host tilde.club
 Host bastion1.local
   User powellc
 
-# Cloud
+# ChicagoVPS
 Host pandora.unbl.ink
   User root
 
+# Inside our network, skip strict host key checking
 Host *.local
   StrictHostKeyChecking no
 
 # Bare metal hosts
+Host hati.local
+  User powellc
+Host ymir.local
+  User powellc
+Host aegir.local
+  User powellc
 Host tarqeq.local
   User powellc
 Host fenrir.local
@@ -88,23 +104,23 @@ Host skathi.local
 Host tarvos.local
   User powellc
 
+# ???
 Host telesto.local
   User root
   IdentityFile ~/.ssh/1904_powellc
+
+# PBP uses root user
 Host penobscotbaypress.com
   User root
 
-# bhyve VMs
-Host mopidy.local
-  User powellc
-
 ## Jail hosts all need a jump
 Host *.local 192.168.1.*
   User root
   IdentityFile ~/.ssh/jails
   Hostname %h
-  #ProxyJump bastion.unbl.ink
+  ProxyJump bastion.unbl.ink
 
+# 15Five environments
 Host *.cloud51
     HostName %h
     User colin
@@ -125,7 +141,7 @@ Host bastion.cloud51.15five.com
 Host *.cloud100
     HostName %h
     User colin
-    IdentityFile ~/.ssh/ff_cloud100_rsa_2022q1
+    IdentityFile ~/.ssh/ff_cloud100_rsa_2022q2
     ProxyJump bastion.cloud100.15five.com
     LocalForward 127.0.0.1:5437 db.mirror0.cloud100:5432
     Port 155
@@ -135,14 +151,14 @@ Host *.cloud100
 
 Host bastion.cloud100.15five.com
     User colin
-    IdentityFile ~/.ssh/ff_cloud100_rsa_2022q1
+    IdentityFile ~/.ssh/ff_cloud100_rsa_2022q2
     Port 155
     AddKeysToAgent yes
 
 Host *.cloud101
     HostName %h
     User colin
-    IdentityFile ~/.ssh/ff_cloud101_rsa_2022q1
+    IdentityFile ~/.ssh/ff_cloud101_rsa_2022q2
     ProxyJump bastion.cloud101.15five.com
     LocalForward 127.0.0.1:5437 db.mirror0.cloud101:5432
     Port 155
@@ -152,9 +168,6 @@ Host *.cloud101
 
 Host bastion.cloud101.15five.com
     User colin
-    IdentityFile ~/.ssh/ff_cloud101_rsa_2022q1
+    IdentityFile ~/.ssh/ff_cloud101_rsa_2022q2
     Port 155
     AddKeysToAgent yes
-
-Host 192.168.1.238
-    Port 2222