diff --git a/.ssh/config.d/20_endless b/.ssh/config.d/20_endless
index 4f6178b79b37e07928d5659cba34610250af6f3a..d111ccccb4a4d1b6c3cf60c3ecae905d4cb45604 100644
--- a/.ssh/config.d/20_endless
+++ b/.ssh/config.d/20_endless
@@ -5,11 +5,6 @@ Host appupdates.endlessm.com irc.endlessm.com status.endlessm.com
 Port 2200
 ProxyCommand ssh vpn-router.uw2.endlessm.com -W %h:%p
 
-Host sf.endlessm-sf.com
-User endlessadmin
-ProxyCommand ssh vpn-router.sf.endlessm.com -W %h:%p
-Ciphers aes256-cbc
-
 Host vpn-router.sf.endlessm.com
 Port 2022
 
@@ -23,8 +18,9 @@ Ciphers aes256-cbc
 User endlessapadmin
 
 Host router.endlessm-sf.com
-ProxyCommand none
+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