diff --git a/.ssh/config.d/20_ec2 b/.ssh/config.d/20_ec2
index 2085d6f6d19d8dd596dcf96b326c83cb54a9bde4..d23a1b56b6c1f3e4295431c811a1825208055c65 100644
--- a/.ssh/config.d/20_ec2
+++ b/.ssh/config.d/20_ec2
@@ -1,4 +1,5 @@
 # Disable SSH host key checking for EC2 instances.
+
 Host  *.compute-1.amazonaws.com
 UserKnownHostsFile /dev/null
 StrictHostKeyChecking no
diff --git a/.ssh/config.d/20_shore b/.ssh/config.d/20_shore
index 4833efecb6adf351a908854e452e39d87a227178..21fe2d6021bf76a8afe59b9ac137b59611314251 100644
--- a/.ssh/config.d/20_shore
+++ b/.ssh/config.d/20_shore
@@ -1,12 +1,11 @@
 # shore.co.il infrastructure
 
-User nimrod
-IdentityFile shore_rsa
-
 Host ns1
 HostName ns1.shore.co.il
 LocalForward 9091 xbmc.trusted:9091
 DynamicForward 8080
+User nimrod
+IdentityFile ~/.ssh/shore_rsa
 
 Host xbmc
 HostName xbmc.trusted
@@ -17,13 +16,21 @@ ProxyCommand ssh ns1 nc %h %p
 Host web1
 HostName web1.trusted
 ProxyCommand ssh ns1 nc %h %p
+User nimrod
+IdentityFile ~/.ssh/shore_rsa
 
 Host ns2
 HostName ns2.shore.co.il
 User admin
 DynamicForward 9999
 ProxyCommand ssh ns1 nc %h %p
+IdentityFile ~/.ssh/shore_rsa
 
 Host cgit
 HostName cgit.trusted
 ProxyCommand ssh ns1 nc %h %p
+User nimrod
+IdentityFile ~/.ssh/shore_rsa
+
+HostName gitolite.Ansible.vagrant
+IdentityFile ~/.ssh/shore_rsa