diff --git a/bash/.bash/completions.bash b/bash/.bash/completions.bash
index ba50e47..b1b6589 100644
--- a/bash/.bash/completions.bash
+++ b/bash/.bash/completions.bash
@@ -1,2 +1,2 @@
 # SSH completion based on ssh config
-[ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh;
+[ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config* | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh;
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 3c037f7..3678104 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1,46 +1,8 @@
+Include config-private
+
 User nikdoof
 AddKeysToAgent yes
 
-Host github.com
-    User git
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_github
-
-Host tildegit.org
-    User git
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_tildegit
-
-Host heroku.com
-    User git
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_heroku
-
-Host *.doofnet.uk
-    ForwardAgent yes
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_home
-
-Host *.tensixtyone.com
-    ForwardAgent yes
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_tensixtyone
-
-Host dimension.sh
-    ForwardAgent yes
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_dimension
-
-Host *.dimension.sh
-    ForwardAgent yes
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_dimension
-
-Host gamut.one
-    ForwardAgent yes
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519_dimension
-
 Host *
     ForwardAgent no
     ForwardX11 no