diff --git a/ssh_config b/ssh_config
index 58584f5..a4462ad 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,7 @@
 Host *
+    IdentitiesOnly yes
     IdentityFile /config/ssh_identity
     UserKnownHostsFile /config/ssh_known_hosts
-    HostKeyAlgorithms +ssh-rsa # TODO: Remove this after ROS7 upgrades
+    # TODO: Remove following after ROS7 upgrades
+    HostKeyAlgorithms +ssh-rsa
+    PubkeyAcceptedKeyTypes +ssh-rsa