diff --git a/.ssh/config.d/20_schoolinks b/.ssh/config.d/20_schoolinks
index 636bfa93e86b6a06177a76e81d226c70deff2b87..85602f6e0a4fe1755421899a7d7bd81a51136387 100644
--- a/.ssh/config.d/20_schoolinks
+++ b/.ssh/config.d/20_schoolinks
@@ -2,3 +2,33 @@
 # vim:ft=sshconfig
 # SchooLinks infrastructure
 
+Host api-*.schoolinks.com api.schoolinks.com celery.schoolinks.com
+ProxyCommand ssh vpn.schoolinks.com -W %h:%p
+
+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
+
+Host sftp.schoolinks.com
+IdentityFile ~/.ssh/schoolinks_sftp_rsa
+User ec2-user
+
+Host vpn.schoolinks.com
+HostName 18.210.9.60
+IdentityFile ~/.ssh/schoolinks_vpn_rsa
+User centos
+
+Host *.schoolinks.com
+User ubuntu
+IdentityFile ~/.ssh/schoolinks_prod_rsa
diff --git a/Makefile b/Makefile
index b9ddd96e68d88fc53fc02bb9f749601277717a6f..20d95ba47a637a74dd97f35d19d658befad29fc1 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,14 @@ ssh-keys: .ssh/github_ed25519
 ssh-keys: .ssh/shore_ecdsa
 ssh-keys: .ssh/shore_ed25519
 ssh-keys: .ssh/shore_rsa
+ssh-keys: .ssh/schoolinks_ci_rsa
+ssh-keys: .ssh/schoolinks_dev_rsa
+ssh-keys: .ssh/schoolinks_prod_rsa
+ssh-keys: .ssh/schoolinks_sftp_rsa
+ssh-keys: .ssh/schoolinks_stable_rsa
+ssh-keys: .ssh/schoolinks_staging_rsa
+ssh-keys: .ssh/schoolinks_qa_rsa
+ssh-keys: .ssh/schoolinks_vpn_rsa
 
 .ssh/%_rsa: Documents/Database.kdbx
 	$(mkd)