diff --git a/.ssh/config.d/20_bigpanda b/.ssh/config.d/20_bigpanda
index 8e5e1f4d4847e1f1aab78b901119448d6fc1a9d3..7fb0f3c0a26719c46c439c7b0e5ea8ba12457444 100644
--- a/.ssh/config.d/20_bigpanda
+++ b/.ssh/config.d/20_bigpanda
@@ -1,9 +1,14 @@
 # BigPanda servers
 
-Host prod-* stage-* ec2-* staging* ci.bigpanda.io demo*
+Host prod-* stage-* staging* demo* *.bigpanda.io
 User ubuntu
 IdentityFile ~/.ssh/bigpanda
 
 Host ender
 User nimrod
 IdentityFile ~/.ssh/bigpanda
+
+Host github-bp
+HostName github.com
+User git
+IdentityFile ~/.ssh/bigpanda
diff --git a/.ssh/config.d/20_github b/.ssh/config.d/20_github
index 9f45062f9ab00dbb692d6d15f0887ed75d2d756e..b6653d88dc427b81480b5282a488eb8fa2c5f5f5 100644
--- a/.ssh/config.d/20_github
+++ b/.ssh/config.d/20_github
@@ -1,5 +1,5 @@
 # github.com
 
-Host github.com
-User git
-IdentityFile ~/.ssh/bigpanda
+#Host github.com
+#User git
+#IdentityFile ~/.ssh/id_rsa
diff --git a/.ssh/config.d/20_shore b/.ssh/config.d/20_shore
index a499c045839d62028f70d9476a0440559b088a78..2da0884852a1329f29b8da65d68d1645c46354d2 100644
--- a/.ssh/config.d/20_shore
+++ b/.ssh/config.d/20_shore
@@ -19,7 +19,8 @@ ProxyCommand ssh ns1 nc %h %p
 Host ns2
 HostName ns2.shore.co.il
 User admin
-DynamicForward 8080
+DynamicForward 9999
+ProxyCommand ssh ns1 nc %h %p
 
 Host cgit
 HostName cgit.trusted