diff --git a/.ssh/config.d/20_endless b/.ssh/config.d/20_endless
index a9d3420f12c0b02849ffc84acc561433b4c77227..d6350d1493a56ad46f7c86b5b39f1763a8af4149 100644
--- a/.ssh/config.d/20_endless
+++ b/.ssh/config.d/20_endless
@@ -1,7 +1,8 @@
-Host 10.*.*.* *.endlessm.com *.endlessm-sf.com
+Host 172.31.*.* 10.*.*.* *.endlessm.com *.endlessm-sf.com endlessm.com
 User nimrod
 IdentityFile ~/.ssh/endless_ecdsa
 
-Host 10.*.*.*
+Host 172.31.*.* 10.*.*.* *.endlessm-sf.com
 UserKnownHostsFile /dev/null
 StrictHostKeyChecking no
+ProxyCommand ssh vpn-router.uw2.endlessm.com -W %h:%p