diff --git a/pages/merlin6/05-Software-Support/ansys-hfss.md b/pages/merlin6/05-Software-Support/ansys-hfss.md
index 89cd03e..6984617 100644
--- a/pages/merlin6/05-Software-Support/ansys-hfss.md
+++ b/pages/merlin6/05-Software-Support/ansys-hfss.md
@@ -37,12 +37,34 @@ Running jobs through Remote RSM or Slurm is the recommended way for running ANSY
 ### HFSS RSM (from remote workstations)
 
 Running jobs through Remote RSM is the way for running ANSYS HFSS when submitting from an ANSYS HFSS installation on a PSI Windows workstation.
-A HFSS RSM service is running on each **Merlin login node**:
-- `merlin-l-01.psi.ch:32958`
-- `merlin-l-001.psi.ch:32958`
-- `merlin-l-002.psi.ch:32958`
+A HFSS RSM service is running on each **Merlin login node**, and the listening port depends on the ANSYS EM version. Current support ANSYS EM RSM
+release and associated listening ports are the following:
 
-The service is listening on port **`32958`** which is the default for ANSYS/2022R1. Windows workstations must ensure that **Electronics Desktop** is connecting to that port (in general, this does not need changes in the configuration unless it was previously modified or a new ANSYS version changes the default port).
+<table>
+  <thead>
+   <tr>
+   <th scope='col' style="vertical-align:middle;text-align:center;">ANSYS version</th>
+   <th scope='col' style="vertical-align:middle;text-align:center;">Login nodes</th>
+   <th scope='col' style="vertical-align:middle;text-align:center;">Listening port</th>
+   </tr>
+  </thead>
+  <tbody>
+   <tr align="center">
+   <td>2022R1</td>
+   <td><font size="2" face="Courier New">merlin-l-001 merlin-l-001 merlin-l-001</font></td>
+   <td>32958</td>
+   </tr>
+   <tr align="center">
+   <td>2022R2</td>
+   <td><font size="2" face="Courier New">merlin-l-001 merlin-l-001 merlin-l-001</font></td>
+   <td>32959</td>
+   </tr>
+  </tbody>
+</table>
+
+Notice that by default ANSYS EM is listening on port **`32958`**, this is the default for **ANSYS/2022R1** only.
+* Workstations connecting to the Merlin ANSYS EM service must ensure that **Electronics Desktop** is connecting to the proper port.
+* In the same way, the ANSYS Workstation version must be the same as the version running on Merlin.
 
 Notice that _HFSS RSM is not the same RSM provided for other ANSYS products._ Therefore, the configuration is different from [ANSYS RSM](/merlin6/ansys-rsm.html).