diff --git a/.ssh/config b/.ssh/config
index 968a0a1..ff5ed02 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,52 +1,14 @@
-# This is my SSH client configuration I use for both Nix-based and non-Nix
-# systems, mainly because I am not yet ready to codify them into home-manager
-# at the moment. Note that we might need to hack around the 1Password CLI
-# for headless setups like tildes and agent forwards.
-# load 1Password-specifics here
-Include ~/.ssh/1Password/config
-
-# infra on tailnet
-Host devlabs-infraops
-    HostName devlabs-infraops
-    User ajhalili2006
-
+# This is my SSH client configuration I use for both Nix-based and non-Nix systems,
+#mainly because I am not yet ready to codify them into home-manager at the moment.
+#Note that we might need to hack around the 1Password CLI for headless setups like tildes
+# and agent forwarding.
 
-# tildeverse
-Host nest
-    HostName hackclub.app
-    User ajhalili2006
-Host psf
-    HostName p.psf.lt
-    User ajhalili2006
-Host ctrl-c
-    HostName ctrl-c.clib
-    User ajhalili2006
-Host hashbang
-    HostName de1.hashbang.sh
-    User ajhalili2006
-# uberspace.de
-Host ub
-    HostName antila.uberspace.de
-    User ajhalili
-Host ajhalili.ub
-    HostName antila.uberspace.de
-    User ajhalili
+Include ~/.ssh/configs/*
 
 # iykyk
 Host den
     HostName hack.kim
     User ajhalili2006
 
-# Recap Time Squad specifics
-Host stellapent
-    HostName stellapent-cier.fawn-cod.ts.net
-    User gildedguy
-Host rpi-aether
-    HostName rpi-aether.fawn-cod.ts.net
-    User ajhalili2006
-# Our own proxyparty instance on virtnet.bond :)
-#Host proxyparty
-#    # Will set this up later
-#    Hostname proxypartylab.tuna-skate.ts.net
-#Host procyparty-clearnet
-#    Hostname 2a0b-4e07-8-1--8ef.virtnet.host
+# load 1Password-specifics here
+Include ~/.ssh/1Password/config
diff --git a/.ssh/configs/homelab b/.ssh/configs/homelab
new file mode 100644
index 0000000..fee14f7
--- /dev/null
+++ b/.ssh/configs/homelab
@@ -0,0 +1,24 @@
+# infra on tailnet
+Host homelab
+  Hostname lairland
+  User ajhalili2006
+Host aether
+  HostName rpi-aether
+  User ajhalili2006
+Host stellapent
+  Hostname stellapent-cier
+  User gildedguy
+Host devlabs-infraops
+  HostName devlabs-infraops
+  User ajhalili2006
+
+# uberspace.de
+Host ub
+    HostName aegir.uberspace.de
+    User lairland
+Host lairland.uberspace.de
+    HostName aegir.uberspace.de
+    User lairland
+Host ajhalili.ub
+    HostName aegir.uberspace.de
+    User lairland
diff --git a/.ssh/configs/recaptime-dev b/.ssh/configs/recaptime-dev
new file mode 100644
index 0000000..785c454
--- /dev/null
+++ b/.ssh/configs/recaptime-dev
@@ -0,0 +1,11 @@
+# RecapTime.dev infra specifics
+
+# Hack Club Nest
+Host rtdev.nest
+  Host hackclub.app
+  User recaptime-dev
+
+# Technically speaking 
+Host proxypartylab
+  Hostname proxypartylab-azure
+  User ajhalili2006
diff --git a/.ssh/configs/tilde b/.ssh/configs/tilde
new file mode 100644
index 0000000..6de561b
--- /dev/null
+++ b/.ssh/configs/tilde
@@ -0,0 +1,13 @@
+# SSH hosts for tildes in the tildeverse
+Host nest
+    HostName hackclub.app
+    User ajhalili2006
+Host psf
+    HostName p.psf.lt
+    User ajhalili2006
+Host ctrl-c
+    HostName ctrl-c.clib
+    User ajhalili2006
+Host hashbang
+    HostName de1.hashbang.sh
+    User ajhalili2006
diff --git a/.ssh/keys/.keep b/.ssh/keys/.keep
new file mode 100644
index 0000000..e69de29