diff --git a/.ssh/config.d/20_schoolinks b/.ssh/config.d/20_schoolinks
index a2102fb3d8e0cd1331c1ef5013c1ec631270609c..01b280080f2ed2f04d9cf16902443492bd9d4fad 100644
--- a/.ssh/config.d/20_schoolinks
+++ b/.ssh/config.d/20_schoolinks
@@ -2,7 +2,7 @@
 # vim:ft=sshconfig
 # SchooLinks infrastructure
 
-Host api-*.schoolinks.com api.schoolinks.com celery.schoolinks.com monitoring.schoolinks.com ci.schoolinks.com
+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
@@ -35,6 +35,6 @@ Host vpn.schoolinks.com
     IdentityFile ~/.ssh/schoolinks_vpn_rsa
     User centos
 
-Host *.schoolinks.com
+Host *.schoolinks.com 172.31.*.*
     User ubuntu
     IdentityFile ~/.ssh/schoolinks_prod_rsa