diff --git a/.ssh/config.d/20_github b/.ssh/config.d/20_github
index 74252a59d09523458b3cf36a80728db19c81b0d7..65bb6bed0f8b1e3aeed60b3f38deaeb80882410d 100644
--- a/.ssh/config.d/20_github
+++ b/.ssh/config.d/20_github
@@ -3,5 +3,5 @@
 # github.com
 
 Host github.com
-User git
-IdentityFile ~/.ssh/github_ed25519
+    User git
+    IdentityFile ~/.ssh/github_ed25519
diff --git a/.ssh/config.d/20_gitlab_fdo b/.ssh/config.d/20_gitlab_fdo
index 3236dd0e4a8b9bd8cd787b77e5fdb37f5eb28ed9..dc095b688ba63b5bc34209325f2b7dfc93f556df 100644
--- a/.ssh/config.d/20_gitlab_fdo
+++ b/.ssh/config.d/20_gitlab_fdo
@@ -3,6 +3,5 @@
 # gitlab.freedesktop.org
 
 Host gitlab.freedesktop.org
-User git
-IdentityFile ~/.ssh/gitlab_fdo_ed25519
-
+    User git
+    IdentityFile ~/.ssh/gitlab_fdo_ed25519
diff --git a/.ssh/config.d/20_gitlab_toptal b/.ssh/config.d/20_gitlab_toptal
index 5baf9be1127d9338e965978bf8b791860aef4eed..b31f5b74747fc2c8584ef3a6270c25ecc146850a 100644
--- a/.ssh/config.d/20_gitlab_toptal
+++ b/.ssh/config.d/20_gitlab_toptal
@@ -3,6 +3,5 @@
 # git.toptal.com
 
 Host git.toptal.com
-User git
-IdentityFile ~/.ssh/gitlab_toptal_ed25519
-
+    User git
+    IdentityFile ~/.ssh/gitlab_toptal_ed25519
diff --git a/.ssh/config.d/20_schoolinks b/.ssh/config.d/20_schoolinks
index 85602f6e0a4fe1755421899a7d7bd81a51136387..b4a7bf064a2855ee5eccb0f85e7623401594b29f 100644
--- a/.ssh/config.d/20_schoolinks
+++ b/.ssh/config.d/20_schoolinks
@@ -3,32 +3,32 @@
 # SchooLinks infrastructure
 
 Host api-*.schoolinks.com api.schoolinks.com celery.schoolinks.com
-ProxyCommand ssh vpn.schoolinks.com -W %h:%p
+    ProxyCommand ssh vpn.schoolinks.com -W %h:%p
 
 Host api-dev.schoolinks.com
-IdentityFile ~/.ssh/schoolinks_dev_rsa
+    IdentityFile ~/.ssh/schoolinks_dev_rsa
 
 Host api-qa.schoolinks.com
-IdentityFile ~/.ssh/schoolinks_qa_rsa
+    IdentityFile ~/.ssh/schoolinks_qa_rsa
 
 Host api-stable.schoolinks.com
-IdentityFile ~/.ssh/schoolinks_stable_rsa
+    IdentityFile ~/.ssh/schoolinks_stable_rsa
 
 Host api-staging.schoolinks.com
-IdentityFile ~/.ssh/schoolinks_staging_rsa
+    IdentityFile ~/.ssh/schoolinks_staging_rsa
 
 Host ci.schoolinks.com
-IdentityFile ~/.ssh/schoolinks_ci_rsa
+    IdentityFile ~/.ssh/schoolinks_ci_rsa
 
 Host sftp.schoolinks.com
-IdentityFile ~/.ssh/schoolinks_sftp_rsa
-User ec2-user
+    IdentityFile ~/.ssh/schoolinks_sftp_rsa
+    User ec2-user
 
 Host vpn.schoolinks.com
-HostName 18.210.9.60
-IdentityFile ~/.ssh/schoolinks_vpn_rsa
-User centos
+    HostName 18.210.9.60
+    IdentityFile ~/.ssh/schoolinks_vpn_rsa
+    User centos
 
 Host *.schoolinks.com
-User ubuntu
-IdentityFile ~/.ssh/schoolinks_prod_rsa
+    User ubuntu
+    IdentityFile ~/.ssh/schoolinks_prod_rsa
diff --git a/.ssh/config.d/20_shore b/.ssh/config.d/20_shore
index 7947d1c44acefdb482b5e5ca8a195382744cc0e5..f6a2b404657e5ddb67286ba083c0e8985c5e046a 100644
--- a/.ssh/config.d/20_shore
+++ b/.ssh/config.d/20_shore
@@ -3,22 +3,22 @@
 # shore.co.il infrastructure
 
 Host host01.shore.co.il kodi.shore.co.il ea6350.shore.co.il git.shore.co.il
-ProxyCommand ssh ns1.shore.co.il -W %h:%p
+    ProxyCommand ssh ns1.shore.co.il -W %h:%p
 
 Host host01.shore.co.il ns4.shore.co.il
-LocalForward 9090 localhost:9090
+    LocalForward 9090 localhost:9090
 
 Host ea6350.shore.co.il
-IdentityFile ~/.ssh/shore_rsa
-User root
-LocalForward 8080 localhost:80
+    IdentityFile ~/.ssh/shore_rsa
+    User root
+    LocalForward 8080 localhost:80
 
 Host git.shore.co.il
-IdentityFile ~/.ssh/gitlab_ed25519
-HostName host01.shore.co.il
-Port 2222
+    IdentityFile ~/.ssh/gitlab_ed25519
+    HostName host01.shore.co.il
+    Port 2222
 
 Host *.shore.co.il 192.168.3.*
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_ed25519
-User nimrod
+    IdentityFile ~/.ssh/shore_ecdsa
+    IdentityFile ~/.ssh/shore_ed25519
+    User nimrod
diff --git a/.ssh/config.d/30_localhost b/.ssh/config.d/30_localhost
index e290116f3015c0ae5206688e342c191f43ffd2d8..a750f53bd20ac24a7f808557dcb823ab29058531 100644
--- a/.ssh/config.d/30_localhost
+++ b/.ssh/config.d/30_localhost
@@ -3,7 +3,7 @@
 # localhost
 
 Host localhost
-HostName 127.0.0.1
-IdentityFile ~/.ssh/localhost
-UserKnownHostsFile /dev/null
-StrictHostKeyChecking no
+    HostName 127.0.0.1
+    IdentityFile ~/.ssh/localhost
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no