diff --git a/.ssh/config.d/20_bullguard b/.ssh/config.d/20_bullguard
index efbd91de17e1df4159a1c4378a3344ddf8985ddc..7b0a488aa311945013a9e2c504ce5448b5c1327b 100644
--- a/.ssh/config.d/20_bullguard
+++ b/.ssh/config.d/20_bullguard
@@ -30,6 +30,26 @@ HostName ran-stg-build.dc.dojo-labs.com
 User ubuntu
 IdentityFile ~/.ssh/bullguard_ecdsa
 
+Host demo-csp.dc.dojo-labs.com
+User ubuntu
+IdentityFile ~/.ssh/bullguard-prod_rsa
+
+Host dev-csp.dc.dojo-labs.com
+User ubuntu
+IdentityFile ~/.ssh/bullguard-dev_rsa
+
+Host qa-csp.dc.dojo-labs.com
+User ubuntu
+IdentityFile ~/.ssh/bullguard-qa_rsa
+
+Host int-csp.dc.dojo-labs.com
+User ubuntu
+IdentityFile ~/.ssh/bullguard-integration_rsa
+
+Host stg-csp.dc.dojo-labs.com
+User ubuntu
+IdentityFile ~/.ssh/bullguard-staging_rsa
+
 Host 172.23.44.125
 IdentityFile ~/.ssh/bullguard-ofer_rsa
 
@@ -39,18 +59,6 @@ IdentityFile ~/.ssh/bullguard-ofer_rsa
 Host 172.23.93.156
 User ec2-user
 
-Host 172.50.0.160
-User ec2-user
-
-Host 172.20.0.44
-User ec2-user
-
-Host 172.20.0.51
-User ec2-user
-
-Host 172.20.0.233
-User ec2-user
-
 Host 172.16.*.*
 IdentityFile ~/.ssh/bullguard-dev_rsa
 User ubuntu
@@ -130,8 +138,3 @@ Host bastion.ops.dojo-labs.com
 User admin
 IdentityFile ~/.ssh/bullguard-dev_rsa
 ForwardAgent yes
-
-Host 172.24.*.*
-IdentityFile ~/.ssh/bullguard-dev_rsa
-User admin
-ProxyCommand ssh bastion.ops.dojo-labs.com -W %h:%p