diff --git a/.ssh/config b/.ssh/config
index 69881bf..87af48f 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,13 +1,10 @@
+# Include drop-in configurations
+Include ~/.ssh/config.d/*.conf
+
+# Global configuration
 AddKeysToAgent yes
 
-Host afra-door
-    HostName 172.23.42.69
-    ProxyJump afra.fe80.eu
-    User pi
-
-Host toriel-dropbear
-    HostName 192.168.16.4
-    User root
-    RemoteCommand cryptroot-unlock
-    RequestTTY yes
-
+# Host defaults
+Host *
+    IdentitiesOnly yes
+    SendEnv LANG LC_*
diff --git a/.ssh/config.d/50_hosts.conf b/.ssh/config.d/50_hosts.conf
new file mode 100644
index 0000000..f683fd2
--- /dev/null
+++ b/.ssh/config.d/50_hosts.conf
@@ -0,0 +1,8 @@
+Host toriel
+    ForwardAgent yes
+
+Host toriel-dropbear
+    HostName 192.168.16.4
+    User root
+    RemoteCommand cryptroot-unlock
+    RequestTTY yes