diff --git a/engineering-guide/infrastructure_systems.md b/engineering-guide/infrastructure_systems.md
index c3875c27..b1c21afc 100644
--- a/engineering-guide/infrastructure_systems.md
+++ b/engineering-guide/infrastructure_systems.md
@@ -3,11 +3,11 @@ List of systems and their primary role:
 
 
 __Core Infrastructure:__
-* [boot.psi.ch](boot_server.md)  - TFTP server for PXE booting
-* [sysdb.psi.ch](sysdb_server.md) - Runs sysdb, providing the dynamic iPXE, Grub and kickstart files
-* [puppet.psi.ch](puppet_server.md) - puppet.psi.ch - Puppet server
-* [repos.psi.ch](repo_server.md) - Repository server
-* [lx-sync-01.psi.ch](sync_server.md) - System to mirror external yum repositories / packages / ...
+* [`boot.psi.ch`](boot_server.md)  - TFTP server for PXE booting
+* [`sysdb.psi.ch`](sysdb_server.md) - Runs sysdb, providing the dynamic iPXE, Grub and kickstart files
+* [`puppet.psi.ch`](puppet_server.md) - puppet.psi.ch - Puppet server
+* [`repos.psi.ch`](repo_server.md) - Repository server
+* [`lx-sync-01.psi.ch`](sync_server.md) - System to mirror external yum repositories / packages / ...
 
 * [lxweb00](lxweb00) - http://linux.web.psi.ch - legacy - 129.129.190.46 - Exports further repositories from AFS
 
@@ -16,18 +16,20 @@ __Core Infrastructure:__
 __Additional Infrastructure__
 
 Sysdb Access:
-* [lxsup](lxsup) - Standard node for the linux support, primarily to run bob
+* [`lxsup.psi.ch`](lxsup) - Standard node for the linux support, primarily to run bob
 
 
 Monitoring:
 
 * [Icinga2](icinga2) - automatic integration into Icinga2
-* [lx-influx-01.psi.ch](influx) - Influx database server
-* [lx-metrics-01.psi.ch](metrics) - https://metrics.psi.ch - Grafana frontend for Influx
+* [`lx-influx-01.psi.ch`](influx) - Influx database server
+* [`lx-metrics-01.psi.ch`](metrics) - https://metrics.psi.ch - Grafana frontend for Influx
 
 
 __Enduser Systems__
-* [login.psi.ch](login) - Set of nodes for enduser use
+* [`login.psi.ch`](login) - Set of nodes for enduser use
+* `lx-term.psi.ch - RDP Linux terminal server
+* [`nx-term.psi.ch](https://nx-term.psi.ch) - NoMachine NX Linux terminal server
 * cpw.psi.ch - Node to change passwords