diff --git a/.ssh/config.d/20_endless b/.ssh/config.d/20_endless
index d111ccccb4a4d1b6c3cf60c3ecae905d4cb45604..7c260273c6d55d6e4b942bd50b31dac4da1c7f06 100644
--- a/.ssh/config.d/20_endless
+++ b/.ssh/config.d/20_endless
@@ -3,7 +3,6 @@
 
 Host appupdates.endlessm.com irc.endlessm.com status.endlessm.com
 Port 2200
-ProxyCommand ssh vpn-router.uw2.endlessm.com -W %h:%p
 
 Host vpn-router.sf.endlessm.com
 Port 2022
@@ -13,22 +12,17 @@ KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1
 MACs hmac-sha1
 User sysmgr
 
-Host ap?.endlessm-sf.com
+Host ap?.endlessm-sf.com router.endlessm-sf.com
 Ciphers aes256-cbc
 User endlessapadmin
 
-Host router.endlessm-sf.com
-ProxyCommand ssh vpn-router.sf.endlessm.com -W %h:%p
-Ciphers aes256-cbc
-User endlessadmin
-
 Host 10.17.*.* *.dev.endlessm.com *.dev.endlessm-sf.com
 ProxyCommand ssh vpn-router.uw1.endlessm.com -W %h:%p
 
 Host 172.31.*.* 10.*.*.* *.endlessm-sf.com
 UserKnownHostsFile /dev/null
 StrictHostKeyChecking no
-ProxyCommand ssh vpn-router.uw2.endlessm.com -W %h:%p
+ProxyCommand ssh openvpn.endlessm.com -W %h:%p
 
 Host 172.31.*.* 10.*.*.* *.endlessm.com *.endlessm-sf.com endlessm.com
 User nimrod