diff --git a/docs/access/ssh.md b/docs/access/ssh.md
index 43b38345..881d18a3 100644
--- a/docs/access/ssh.md
+++ b/docs/access/ssh.md
@@ -103,6 +103,7 @@ ssh -i ~/.ssh/cscs-key ela.cscs.ch
 To log into a target system at CSCS, you need to perform some additional setup to handle forwarding of SSH keys generated using the SSHService.
 There are two alternatives detailed below.
 
+[](){#ssh-ssh-config}
 ### Adding Ela as a jump host in SSH Configuration
 
 This approach configures Ela as a jump host and creates aliases for the systems that you want to access in `~/.ssh/config` on your laptop or PC.
@@ -147,6 +148,7 @@ After saving this file, one can directly log into `daint.alps.cscs.ch` from your
 ssh daint
 ```
 
+[](){#ssh-ssh-agent}
 ### Using SSH Agent
 
 Alternatively, the [SSH authentification agent](https://www.ssh.com/academy/ssh/add-command) can be configured to manage the keys.
diff --git a/docs/software/tools/linaro.md b/docs/software/tools/linaro.md
index 022d161b..58ba4d8e 100644
--- a/docs/software/tools/linaro.md
+++ b/docs/software/tools/linaro.md
@@ -132,16 +132,16 @@ Examples of the settings are below.
     | Field       | Value                                   |
     | ----------- | --------------------------------------- |
     | Connection  | `eiger`                                |
-    | Host Name   | `bsmith@ela.cscs.ch bsmith@eiger.cscs.ch`  |
+    | Host Name   | `cscsusername@ela.cscs.ch cscsusername@eiger.cscs.ch`  |
     | Remote Installation Directory | `uenv run linaro-forge/23.1.2:/user-tools -- /user-tools/env/forge/` |
     | Private Key | `$HOME/.ssh/cscs-key` |
 
-=== "Todi"
+=== "Daint"
 
     | Field       | Value                                   |
     | ----------- | --------------------------------------- |
-    | Connection  | `todi`                                  |
-    | Host Name   | `bsmith@ela.cscs.ch bsmith@todi.cscs.ch`  |
+    | Connection  | `daint`                                  |
+    | Host Name   | `cscsusername@ela.cscs.ch cscsusername@daint.cscs.ch`  |
     | Remote Installation Directory | `uenv run linaro-forge/23.1.2:/user-tools -- /user-tools/env/forge/` |    
 
 === "Santis"
@@ -149,7 +149,7 @@ Examples of the settings are below.
     | Field       | Value                                   |
     | ----------- | --------------------------------------- |
     | Connection  | `santis`                                |
-    | Host Name   | `bsmith@ela.cscs.ch bsmith@santis.cscs.ch`  |
+    | Host Name   | `cscsusername@ela.cscs.ch cscsusername@santis.cscs.ch`  |
     | Remote Installation Directory | `uenv run linaro-forge/23.1.2:/user-tools -- /user-tools/env/forge/` |
     | Private Key | `$HOME/.ssh/cscs-key` |
 
@@ -157,9 +157,9 @@ Examples of the settings are below.
 Some notes on the examples above:
 
 * SSH Forwarding via `ela.cscs.ch` is used to access the cluster.
-* replace the username `bsmith` with your CSCS user name that you would normally use to open an SSH connection to CSCS.
+* replace the username `cscsusername` with your CSCS user name that you would normally use to open an SSH connection to CSCS.
 * `Remote Installation Path` is pointing to the install directotory of ddt inside the image
-* private keys should be the ones generated for CSCS MFA, and this field does not need to be set if you have added the key to your SSH agent.
+* private keys should be the ones generated for CSCS MFA, and this field does not need to be set if you have added the key to your [SSH agent][ssh-ssh-agent].
 
 Once configured, test and save the configuration: