diff --git a/services-admin-guide/ssh_gateways.md b/services-admin-guide/ssh_gateways.md
index ff27821d..6fbf7404 100644
--- a/services-admin-guide/ssh_gateways.md
+++ b/services-admin-guide/ssh_gateways.md
@@ -2,7 +2,7 @@
 
 The purpose of the ssh gateways is to give access to protected networks and resources (for a finite period of time). 
 
-Users are only supposed to use ssh to connect to the gateways as well as them to further connect to other machines. Never the less, for ease of use, there are some protocols/ports that can directly be accessed from the ssh gateway. These ports include: 5900 VNC, 3389 RDP, ICMP/PING.
+Users are only supposed to use ssh to connect to the gateways as well as them to further connect to other machines. Never the less, for ease of use, there are some protocols/ports that can directly be accessed from the ssh gateway. These ports include: 5900 VNC, 3389 RDP, 4000 NX, ICMP/PING.
 Therefore direct portforwarding on those ports will work.
 
 ```
diff --git a/services-admin-guide/ssh_gateways_overview.drawio.svg b/services-admin-guide/ssh_gateways_overview.drawio.svg
index 54d90209..1f5667bc 100644
--- a/services-admin-guide/ssh_gateways_overview.drawio.svg
+++ b/services-admin-guide/ssh_gateways_overview.drawio.svg
@@ -1,4 +1,4 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="501px" height="267px" viewBox="-0.5 -0.5 501 267" content="&lt;mxfile&gt;&lt;diagram id=&quot;LdZEgD8OCABI24Oml7D-&quot; name=&quot;Page-1&quot;&gt;3Vpdc6IwFP01PrYDCSg8bm3t9qFdZzuz+5xChEyROCFW3V+/iQQ0fBRUqlJndPCQXLjn3Htzgw7geL5+ZGgRPlMfRwNg+OsBvB8AAE0gPiWwSQHgDFMgYMRPIXMHvJJ/WIGGQpfEx4k2kFMacbLQQY/GMfa4hiHG6EofNqORftUFCnAJePVQVEb/Ep+HKeqA0Q7/iUkQZlc2h256Zo6ywcqTJEQ+Xe1B8GEAx4xSnh7N12McSe4yXtJ5k5qz+Y0xHPNWE9SMDxQtlXPqxvgm8zZgdLkoG85mYsbxuop29JZZ2HkmIgLTOeZsI8Zl4eBY6bwsGkaKnNWO26GCwj1aHVspqtQMcss7h8WB8rnaf6fZfeF97GM53hjAu1VIOH5dIE+eXYnoFljI58L+vSkOZySKxjSibDsXYtu0DDltRmO+h8+2L4EnnNF3vHfmDhjGdkYF4XWM1zILbI3YG7OCWbOC2Tw8T6HWLVE7IQyvkBxUoFi4w3UedV5iGuMCuQpCEQli8dUTLGGB30lyiMjUH+rEnPi+vEylcLq0JzGuKLbtVqELO+AXDC+fuqajR9g5Uzertr3I3VysfuRuRV3sXfIeQPn5kxdeQfJmvm2yYKoKsKoIG3ZAgGmVCPg1mxEhMDBeMF9R9t6bSIOHJ7dOfR5S51g27C8sm4puHyXhdrp5Kl+NsdhFtYMtVpKvTkbrotkIy/V+yigX9y9kBMNIpt0bE0eBPOpdfo5qVLrG/ITlvvns+dmer7Pkp1VeLJMkHEjTE/FZQRCO/R9yny9DKkJJQjydk3qfsa9t/T/12K5wOMMYjhAnH/oDgyoS1BWmlIhbyQPwxjT1EHQKPCZ0yTysZu1v8AuG7M/NcMQCzEtmtorkTrcTybh8Eb1sS2OVn6U8Ii6a5s1+T1MspiZwb7dvd3QrAxpYvamrueR9qKsWuHhdPYCv89TVcg/eNmVrXWmfsyoG3JYpOurAYdhxCFTwYtXw0rjPb1hXrC70rllGg6xK9aXutCd5o7PXFGSdFJrybuLPyzjvVmw3u/BJ/YpKtitpV2ChzQBGgcjW7YrZYKjDhqW85/l9P811gtBxv79OxWXkaJ2KhjrUqbwheho/C6Em06eXx+8vUbHyHy1R0VB3EmW3/JUbtOtSqbg9yx/FH6pS3tfUGepQpfL+RK7PDMlBCWYfxMPJt1MKjMBt8Ucq9zitTHvUZOpotcTX3a/+6fDdXyfgw38=&lt;/diagram&gt;&lt;/mxfile&gt;">
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="501px" height="267px" viewBox="-0.5 -0.5 501 267" content="&lt;mxfile&gt;&lt;diagram id=&quot;LdZEgD8OCABI24Oml7D-&quot; name=&quot;Page-1&quot;&gt;5Vpbc6IwFP41PrYDCag8bu1l+1DX2c7s7msKETJF4oRY6/76TSSgIVBRqUrXGR085Bw433duQXtwNHt/YGgePdEAxz1gBe89eNsDAEBLfErBSgkGbiYIGQkykb0RPJO/WAmVXrggAU61hZzSmJO5LvRpkmCfazLEGF3qy6Y01q86RyE2BM8+ik3pbxLwKJMOwWAj/45JGOVXtvtedmaG8sXKkzRCAV1uieBdD44YpTw7mr2PcCyxy3HJ9O5rzhY3xnDCGykojTcUL5Rz6sb4Kvc2ZHQxNw3nmphx/F4FO3rJLWw8ExGB6QxzthLrlBYcOpleEQ0KnOUG274SRVuwDlXQIMVmWFjeOCwOlM/V/g93uy+8TwIs11s9eLOMCMfPc+TLs0sR3UIW8Zmwf2uLwymJ4xGNKVvrQuzajiXVpjThW/Lp+iXkKWf0FW+duQGWtdaoALwO8VpkgasBe2VXIGtXIFuE5zHQega094ThJZKLShALd7iOo45LQhNcAleJUEzCRHz1BUpYyG8kOERk6jd1YkaCQF6mkjid2qMQVxC7bqPQhS3gC/rnT117qEfYKVM3r7adyN2CrG7kbkVd7Fzy7gH56ZMXXkDy5r6t8mCqCrCqCOu3AIDtGAD8mE6JIBhYY8yXlL12JtLg/smtQ1+E1CnahvuJZVPBHaA0Wqvbx+K1MxbbqHawQSf57GR0zpqN0Kz3E0a5uH9BI+jHMu1emDgK5VHn8nNQw9Il5ic05+aT52dzvE6Sn47ZLNM06knT9+KzAiCcBN/kPl+GVIzSlPg6JvU+40Db+n/osVvhcC5jOEacvOkPDKpAUFeYUCJupQjAK9vWQ3BYwjGlC+ZjpbW9wS8Zcj82wxELMTfMrBkpnG5EkgsMkh5HTxOhNnkcPxzIUImNKsouhiG7XIgPpMiw0x5HjnX+RnfesdMxn3c9IC42NqvtubPc8GzgXa/f3uBaFh3gdKb3FZR3ofc5Zg05de/bA6/T9D5zn9Q0ZWtdaZ6zKga8hik6aMFh2HIIVODi1OCy81nMjs7itMG34X426oR5lepK3WkO8kpHb1eQtVJozB3fr/GomChdL7/wUTOlSrYLGSlhac4AVgnIxvOKvcNQiwOLuS/9eTspeIJw6H19nspt5GCeyoZa5MnctI7/FDQ51v+QTuXqfzBNZUMt7tHM+b/1jfRlsVTepBU/mezLUjHb1BlqkSVzjyJ7NENyUYrZG/Fx+uWYAgNwXf4x0TuMK9sd7DJ1MFvi6+bfGdnyzV9c4N0/&lt;/diagram&gt;&lt;/mxfile&gt;">
     <defs/>
     <g>
         <rect x="349" y="0" width="10" height="220" fill="#e51400" stroke="#b20000" pointer-events="none"/>
@@ -89,6 +89,24 @@
                 </text>
             </switch>
         </g>
+        <path d="M 290 160 L 443.63 160" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="none"/>
+        <path d="M 448.88 160 L 441.88 163.5 L 443.63 160 L 441.88 156.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="none"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 160px; margin-left: 370px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; background-color: rgb(255, 255, 255); white-space: nowrap;">
+                                ICMP/PING
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="370" y="163" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    ICMP/PING
+                </text>
+            </switch>
+        </g>
         <g transform="translate(-0.5 -0.5)">
             <switch>
                 <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
@@ -169,13 +187,13 @@
                     <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 140px; margin-left: 370px;">
                         <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
                             <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                ICMP/PING
+                                NX / 4000
                             </div>
                         </div>
                     </div>
                 </foreignObject>
                 <text x="370" y="143" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
-                    ICMP/PING
+                    NX / 4000
                 </text>
             </switch>
         </g>
@@ -220,8 +238,8 @@
         <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
         <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
             <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Viewer does not support full SVG 1.1
+                Text is not SVG - cannot display
             </text>
         </a>
     </switch>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/services-user-guide/nx_nomachine.md b/services-user-guide/nx_nomachine.md
index 310f17fa..f9e1ffe0 100644
--- a/services-user-guide/nx_nomachine.md
+++ b/services-user-guide/nx_nomachine.md
@@ -2,3 +2,5 @@
 
 More info on the nomachine service can be found here:
 [User Documentation - Intranet](https://www.psi.ch/en/photon-science-data-services/remote-interactive-access)
+
+