diff --git a/.ssh/config.d/20_schoolinks b/.ssh/config.d/20_schoolinks
index 01b280080f2ed2f04d9cf16902443492bd9d4fad..3ee5ae8d7684de747946db687cf7a8411d6c3aa2 100644
--- a/.ssh/config.d/20_schoolinks
+++ b/.ssh/config.d/20_schoolinks
@@ -2,24 +2,9 @@
 # vim:ft=sshconfig
 # SchooLinks infrastructure
 
-Host api-*.schoolinks.com api.schoolinks.com celery.schoolinks.com monitoring.schoolinks.com ci.schoolinks.com 172.31.*.*
-    ProxyCommand ssh vpn.schoolinks.com -W %h:%p
-
 Host api.schoolinks.com
     Hostname 35.170.212.119
 
-Host api-dev*.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_dev_rsa
-
-Host api-qa.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_qa_rsa
-
-Host api-stable.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_stable_rsa
-
-Host api-staging.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_staging_rsa
-
 Host ci.schoolinks.com
     IdentityFile ~/.ssh/schoolinks_ci_rsa
 
@@ -35,6 +20,10 @@ Host vpn.schoolinks.com
     IdentityFile ~/.ssh/schoolinks_vpn_rsa
     User centos
 
+Host !vpn.schoolinks.com *.schoolinks.com 172.31.*.*
+    ProxyCommand ssh vpn.schoolinks.com -W %h:%p
+
 Host *.schoolinks.com 172.31.*.*
     User ubuntu
-    IdentityFile ~/.ssh/schoolinks_prod_rsa
+    IdentityFile ~/.ssh/schoolinks_ed25519
+    IdentityFile ~/.ssh/schoolinks_rsa