diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config
index abfcbf4..78ad1ff 100644
--- a/dotfiles/ssh/config
+++ b/dotfiles/ssh/config
@@ -1,22 +1,21 @@
-# Universal Settings (can't override)
-# Never fall back to protocol 1: it's broken
+# Universal Settings
 Protocol 2
 
+Include ~/.ssh/config.d/*
+
 # Defaults (May be Overridden)
+Host *.*
+  CheckHostIP         yes
+
 Host *
-	ControlMaster 	auto
-	ControlPath		~/.ssh/master/%r@%h:%p
-	ControlPersist	yes
-	ForwardAgent	no
-	ForwardX11		no
-	ForwardX11Trusted	no
-	ServerAliveInterval 120
-	CheckHostIP no
-
-Host warzone
-  Hostname warzone.shadowcats.club
-  Port 22
-  User matir
-
-Host github.com
-  Hostname ssh.github.com
+  CheckHostIP         no
+  ControlMaster       auto
+  ControlPath         ~/.ssh/master/%r@%h:%p
+  ControlPersist      yes
+  ForwardAgent        no
+  ForwardX11          no
+  ForwardX11Trusted   no
+  ServerAliveInterval 120
+  UpdateHostKeys      yes
+  User                david
+  VerifyHostKeyDNS    yes
diff --git a/private_dotfiles/ssh/config b/private_dotfiles/ssh/config
deleted file mode 100644
index bc54d47..0000000
Binary files a/private_dotfiles/ssh/config and /dev/null differ
diff --git a/private_dotfiles/ssh/config.d/hosts b/private_dotfiles/ssh/config.d/hosts
new file mode 100644
index 0000000..f8b0385
Binary files /dev/null and b/private_dotfiles/ssh/config.d/hosts differ