diff --git a/csaxs_bec/device_configs/legacy/e21125_lamni_config.yaml b/csaxs_bec/device_configs/legacy/e21125_lamni_config.yaml
index 4c00d675..758deb45 100644
--- a/csaxs_bec/device_configs/legacy/e21125_lamni_config.yaml
+++ b/csaxs_bec/device_configs/legacy/e21125_lamni_config.yaml
@@ -6,7 +6,7 @@ leyex:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: G
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -25,7 +25,7 @@ leyey:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: H
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -45,7 +45,7 @@ loptx:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: E
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -65,7 +65,7 @@ lopty:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: F
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -85,7 +85,7 @@ loptz:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: D
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -102,7 +102,7 @@ lsamrot:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: C
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -119,7 +119,7 @@ lsamx:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: A
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -138,7 +138,7 @@ lsamy:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: B
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -166,7 +166,7 @@ rtx:
   deviceConfig:
     axis_Id: A
     device_access: true
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     labels: rtx
     limits:
     - 0
@@ -183,7 +183,7 @@ rty:
   deviceConfig:
     axis_Id: B
     device_access: true
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     labels: rty
     limits:
     - 0
@@ -209,7 +209,7 @@ lmagnet:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: F
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -228,7 +228,7 @@ losax:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: A
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -247,7 +247,7 @@ losay:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: B
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -267,7 +267,7 @@ losaz:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: C
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
diff --git a/csaxs_bec/device_configs/ptycho_lamni.yaml b/csaxs_bec/device_configs/ptycho_lamni.yaml
index 8ae80981..0a43c205 100644
--- a/csaxs_bec/device_configs/ptycho_lamni.yaml
+++ b/csaxs_bec/device_configs/ptycho_lamni.yaml
@@ -7,7 +7,7 @@ leyex:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: G
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -33,7 +33,7 @@ leyey:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: H
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -54,7 +54,7 @@ loptx:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: E
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -88,7 +88,7 @@ lopty:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: F
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -109,7 +109,7 @@ loptz:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: D
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 70
       - 83
@@ -131,7 +131,7 @@ lsamrot:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: C
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - -2
       - 362
@@ -150,7 +150,7 @@ lsamx:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: A
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -170,7 +170,7 @@ lsamy:
   deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: B
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -195,7 +195,7 @@ losax:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: A
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -215,7 +215,7 @@ losay:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: B
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -236,7 +236,7 @@ losaz:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: C
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -258,7 +258,7 @@ lcsx:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: D
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -279,7 +279,7 @@ lcsy:
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: E
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
       - 0
       - 0
@@ -305,7 +305,7 @@ rtx:
   deviceConfig:
     axis_Id: A
     device_access: true
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     labels: rtx
     limits:
       - 0
@@ -323,7 +323,7 @@ rty:
   deviceConfig:
     axis_Id: B
     device_access: true
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     labels: rty
     limits:
       - 0
@@ -340,7 +340,7 @@ rty:
 rt_positions:
   deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniFlyer
   deviceConfig:
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     port: 3333
   readoutPriority: async
   connectionTimeout: 20
@@ -352,7 +352,7 @@ rt_positions:
 ############################################################
 ################ Keithley 2400 current source ##############
 ############################################################
-# RS-232 through the TCP-serial bridge on mpc2680 (service lamni-serial-keithley, TCP 3336).
+# RS-232 through the TCP-serial bridge on mpc-lamni (service lamni-serial-keithley, TCP 3336).
 # The Keithley is not always connected; onFailure: buffer keeps the session running without it.
 # compliance_voltage: the output never drives more than this, also with the load disconnected.
 # remote_sense: true needs the sense leads connected at the load.
@@ -360,7 +360,7 @@ keithley:
   description: Keithley 2400 current source
   deviceClass: csaxs_bec.devices.keithley.keithley_2400.Keithley2400
   deviceConfig:
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     port: 3336
     limits:
       - 0
diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml
index 2d88d3ab..5b6f1dab 100644
--- a/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml
+++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml
@@ -9,7 +9,7 @@ leyex:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: G
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -32,7 +32,7 @@ leyey:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: H
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -56,7 +56,7 @@ loptx:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: E
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -86,7 +86,7 @@ lopty:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: F
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -111,7 +111,7 @@ loptz:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: D
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -133,7 +133,7 @@ lsamrot:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: C
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -156,7 +156,7 @@ lsamx:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: A
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -180,7 +180,7 @@ lsamy:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor
   deviceConfig:
     axis_Id: B
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -204,7 +204,7 @@ losax:
   deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor
   deviceConfig:
     axis_Id: A
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -225,7 +225,7 @@ losay:
   deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor
   deviceConfig:
     axis_Id: B
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -247,7 +247,7 @@ losaz:
   deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor
   deviceConfig:
     axis_Id: C
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     limits:
     - 0
     - 0
@@ -269,7 +269,7 @@ rtx:
   deviceConfig:
     axis_Id: A
     device_access: true
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     labels: rtx
     limits:
     - 0
@@ -295,7 +295,7 @@ rty:
   deviceConfig:
     axis_Id: B
     device_access: true
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     labels: rty
     limits:
     - 0
@@ -312,7 +312,7 @@ rty:
 rt_positions:
   deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniFlyer
   deviceConfig:
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     port: 3333
     sim_point_dwell_s: 0.02
     sim_coarse_coupling: *id001
@@ -337,7 +337,7 @@ cam_xeye:
     # the smear/composite rotation-center calibration aid can be exercised
     # in sim. host/port/axis match lsamrot's own sim config above.
     sim_rotation_coupling:
-      galil_host: mpc2680.psi.ch
+      galil_host: mpc-lamni.psi.ch
       galil_port: 8081
       axis: C
     sim_feature_radius_px: 220
diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml
index 90e22ade..b89b3db0 100644
--- a/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml
+++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml
@@ -1,5 +1,5 @@
 # Simulated LamNI endstation with the real Keithley 2400.
-# The keithley entry mirrors the one in ptycho_lamni.yaml (bridge on mpc2680, TCP 3336);
+# The keithley entry mirrors the one in ptycho_lamni.yaml (bridge on mpc-lamni, TCP 3336);
 # keep both in sync.
 lamni:
   - !include ./simulated_bl_simulated_lamni.yaml
@@ -8,7 +8,7 @@ keithley:
   description: Keithley 2400 current source
   deviceClass: csaxs_bec.devices.keithley.keithley_2400.Keithley2400
   deviceConfig:
-    host: mpc2680.psi.ch
+    host: mpc-lamni.psi.ch
     port: 3336
     limits:
       - 0
diff --git a/csaxs_bec/devices/keithley/keithley_2400.py b/csaxs_bec/devices/keithley/keithley_2400.py
index 024bb4c5..386762a2 100644
--- a/csaxs_bec/devices/keithley/keithley_2400.py
+++ b/csaxs_bec/devices/keithley/keithley_2400.py
@@ -273,7 +273,7 @@ class Keithley2400(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=3336,
         limits=(0.0, 3.0),
         tolerance: float = 0.01,
diff --git a/csaxs_bec/devices/npoint/npoint.py b/csaxs_bec/devices/npoint/npoint.py
index 0ab35893..5279f285 100644
--- a/csaxs_bec/devices/npoint/npoint.py
+++ b/csaxs_bec/devices/npoint/npoint.py
@@ -411,7 +411,7 @@ class NPointAxis(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8085,
         limits=None,
         sign=1,
diff --git a/csaxs_bec/devices/omny/galil/fgalil_ophyd.py b/csaxs_bec/devices/omny/galil/fgalil_ophyd.py
index e955ae71..2a103fda 100644
--- a/csaxs_bec/devices/omny/galil/fgalil_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/fgalil_ophyd.py
@@ -169,7 +169,7 @@ class FlomniGalilMotor(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         limits=None,
         sign=1,
@@ -376,7 +376,7 @@ class FlomniGalilMotor(Device, PositionerBase):
 # if __name__ == "__main__":
 #     mock = False
 #     if not mock:
-#         leyey = GalilMotor("H", name="leyey", host="mpc2680.psi.ch", port=8081, sign=-1)
+#         leyey = GalilMotor("H", name="leyey", host="mpc-lamni.psi.ch", port=8081, sign=-1)
 #         leyey.stage()
 #         status = leyey.move(0, wait=True)
 #         status = leyey.move(10, wait=True)
@@ -390,10 +390,10 @@ class FlomniGalilMotor(Device, PositionerBase):
 #         from ophyd_devices.utils.socket import SocketMock
 
 #         leyex = GalilMotor(
-#             "G", name="leyex", host="mpc2680.psi.ch", port=8081, socket_cls=SocketMock
+#             "G", name="leyex", host="mpc-lamni.psi.ch", port=8081, socket_cls=SocketMock
 #         )
 #         leyey = GalilMotor(
-#             "H", name="leyey", host="mpc2680.psi.ch", port=8081, socket_cls=SocketMock
+#             "H", name="leyey", host="mpc-lamni.psi.ch", port=8081, socket_cls=SocketMock
 #         )
 #         leyex.stage()
 #         # leyey.stage()
diff --git a/csaxs_bec/devices/omny/galil/fupr_ophyd.py b/csaxs_bec/devices/omny/galil/fupr_ophyd.py
index 368581f3..1e819bb2 100644
--- a/csaxs_bec/devices/omny/galil/fupr_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/fupr_ophyd.py
@@ -139,7 +139,7 @@ class FuprGalilMotor(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         limits=None,
         sign=1,
diff --git a/csaxs_bec/devices/omny/galil/galil_ophyd.py b/csaxs_bec/devices/omny/galil/galil_ophyd.py
index 41553378..1985e45d 100644
--- a/csaxs_bec/devices/omny/galil/galil_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/galil_ophyd.py
@@ -466,7 +466,7 @@ class GalilSetpointSignal(GalilSignalBase):
                 time.sleep(0.1)
 
             # in the case of lamni, consider moving to lgalil
-            if self.parent.axis_Id_numeric == 2 and self.controller.sock.host == "mpc2680.psi.ch":
+            if self.parent.axis_Id_numeric == 2 and self.controller.sock.host == "mpc-lamni.psi.ch":
                 try:
                     rt = self.parent.device_manager.devices[self.parent.rt]
                     if rt.enabled:
diff --git a/csaxs_bec/devices/omny/galil/lgalil_ophyd.py b/csaxs_bec/devices/omny/galil/lgalil_ophyd.py
index ecfc001a..342fe3c4 100644
--- a/csaxs_bec/devices/omny/galil/lgalil_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/lgalil_ophyd.py
@@ -237,7 +237,7 @@ class LamniGalilMotor(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         limits=None,
         sign=1,
@@ -365,7 +365,7 @@ class LamniGalilMotor(Device, PositionerBase):
         # the LAMNI rotation axis on the shared LAMNI Galil controller. Only lsamrot
         # gets the automatic error-latch reset + retry; other axes on this controller
         # keep today's behavior unchanged.
-        is_lsamrot = self.axis_Id_numeric == 2 and self.controller.sock.host == "mpc2680.psi.ch"
+        is_lsamrot = self.axis_Id_numeric == 2 and self.controller.sock.host == "mpc-lamni.psi.ch"
 
         try:
             self.user_setpoint.put(position, wait=False)
diff --git a/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py b/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py
index 38f3a97b..798553a2 100644
--- a/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py
+++ b/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py
@@ -519,7 +519,7 @@ class RtLamniMotor(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=3333,
         sign=1,
         socket_cls=SocketIO,
@@ -736,7 +736,7 @@ class RtLamniFlyer(Device):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=3333,
         socket_cls=SocketIO,
         device_manager=None,
@@ -934,7 +934,7 @@ class RtLamniFlyer(Device):
 if __name__ == "__main__":  # pragma: no cover
     mock = False
     if not mock:
-        rty = RtLamniMotor("B", name="rty", host="mpc2680.psi.ch", port=3333, sign=1)
+        rty = RtLamniMotor("B", name="rty", host="mpc-lamni.psi.ch", port=3333, sign=1)
         rty.stage()
         status = rty.move(0, wait=True)
         status = rty.move(10, wait=True)
@@ -947,7 +947,7 @@ if __name__ == "__main__":  # pragma: no cover
     else:
         from ophyd_devices.utils.socket import SocketMock
 
-        rtx = RtLamniMotor("A", name="rtx", host="mpc2680.psi.ch", port=3333, socket_cls=SocketMock)
-        rty = RtLamniMotor("B", name="rty", host="mpc2680.psi.ch", port=3333, socket_cls=SocketMock)
+        rtx = RtLamniMotor("A", name="rtx", host="mpc-lamni.psi.ch", port=3333, socket_cls=SocketMock)
+        rty = RtLamniMotor("B", name="rty", host="mpc-lamni.psi.ch", port=3333, socket_cls=SocketMock)
         rtx.stage()
         # rty.stage()
diff --git a/csaxs_bec/devices/sim/sim_lamni.py b/csaxs_bec/devices/sim/sim_lamni.py
index abfa4ac6..a8a96e76 100644
--- a/csaxs_bec/devices/sim/sim_lamni.py
+++ b/csaxs_bec/devices/sim/sim_lamni.py
@@ -1,7 +1,7 @@
 """
 Simulated LamNI endstation devices.
 
-Galil (lamni.dmc, mpc2680:8081): reuses the shared SimGalilState with LamNI specifics —
+Galil (lamni.dmc, mpc-lamni:8081): reuses the shared SimGalilState with LamNI specifics —
 encoder-read axes 0-5 (`TP`/`encpermm`), `swver=28`, error flags `allaxrer`/`caperr`,
 air bearing lights/interlocks on outputs 1/9/13. Motion uses the same base
 `naxis/ntarget/movereq/#NEWPAR` mechanics as flOMNI.
@@ -51,7 +51,7 @@ class SimLamniGalilMotor(LamniGalilMotor):
         prefix="",
         *,
         name,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         limits=None,
         sign=1,
@@ -356,7 +356,7 @@ class SimRtLamniMotor(RtLamniMotor):
         prefix="",
         *,
         name,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=3333,
         limits=None,
         sign=1,
@@ -396,7 +396,7 @@ class SimRtLamniFlyer(RtLamniFlyer):
         prefix="",
         *,
         name,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=3333,
         device_manager=None,
         sim_point_dwell_s=None,
diff --git a/csaxs_bec/devices/smaract/smaract_ophyd.py b/csaxs_bec/devices/smaract/smaract_ophyd.py
index c2e4db79..ef1fc642 100644
--- a/csaxs_bec/devices/smaract/smaract_ophyd.py
+++ b/csaxs_bec/devices/smaract/smaract_ophyd.py
@@ -122,7 +122,7 @@ class SmaractMotor(Device, PositionerBase):
         read_attrs=None,
         configuration_attrs=None,
         parent=None,
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8085,
         limits=None,
         sign=1,
@@ -299,8 +299,8 @@ if __name__ == "__main__":
 
     mock = False
     if not mock:
-        lsmarA = SmaractMotor("A", name="lsmarA", host="mpc2680.psi.ch", port=8085, sign=1)
-        lsmarB = SmaractMotor("B", name="lsmarB", host="mpc2680.psi.ch", port=8085, sign=1)
+        lsmarA = SmaractMotor("A", name="lsmarA", host="mpc-lamni.psi.ch", port=8085, sign=1)
+        lsmarB = SmaractMotor("B", name="lsmarB", host="mpc-lamni.psi.ch", port=8085, sign=1)
 
         lsmarA.stage()
         lsmarB.stage()
@@ -321,10 +321,10 @@ if __name__ == "__main__":
         from ophyd_devices.utils.socket import SocketMock
 
         lsmarA = SmaractMotor(
-            "A", name="lsmarA", host="mpc2680.psi.ch", port=8085, sign=1, socket_cls=SocketMock
+            "A", name="lsmarA", host="mpc-lamni.psi.ch", port=8085, sign=1, socket_cls=SocketMock
         )
         lsmarB = SmaractMotor(
-            "B", name="lsmarB", host="mpc2680.psi.ch", port=8085, sign=1, socket_cls=SocketMock
+            "B", name="lsmarB", host="mpc-lamni.psi.ch", port=8085, sign=1, socket_cls=SocketMock
         )
         lsmarA.stage()
         lsmarB.stage()
diff --git a/docs/user/ptychography/flomni.md b/docs/user/ptychography/flomni.md
index 1e7fa45b..e91b2f58 100644
--- a/docs/user/ptychography/flomni.md
+++ b/docs/user/ptychography/flomni.md
@@ -123,7 +123,7 @@ During operation the BEC GUI will show the relevant cameras or progress informat
 
 The nano-positioning is controlled by a feedback loop running on a real-time linux based computer. With all related hardware connected, this loop has to be started manually.
 
-1. Login to the computer by `ssh control@mpc2680`. The password is written on the physical machine.
+1. Login to the computer by `ssh control@mpc-lamni`. The password is written on the physical machine.
 1. `cd OMNY/flOMNI/`
 1. `./startflOMNI`
 
diff --git a/docs/user/ptychography/lamni.md b/docs/user/ptychography/lamni.md
index 31248dd8..d44e0aef 100644
--- a/docs/user/ptychography/lamni.md
+++ b/docs/user/ptychography/lamni.md
@@ -531,7 +531,7 @@ This part of the manual describes the software structure in more detail.
 
 The nano-positioning is controlled by a feedback loop running on a real-time linux based computer. With all related hardware connected, this loop has to be started manually.
 
-1. Login to the computer by `ssh control@mpc2680`. The password is written on the physical machine.
+1. Login to the computer by `ssh control@mpc-lamni`. The password is written on the physical machine.
 2. `cd OMNY/lamni/`
 3. `./startLAMNI`
 
diff --git a/omny_e2e_tests/sim_lamni_omny_harness.py b/omny_e2e_tests/sim_lamni_omny_harness.py
index 1d6f38bd..d4a4a631 100644
--- a/omny_e2e_tests/sim_lamni_omny_harness.py
+++ b/omny_e2e_tests/sim_lamni_omny_harness.py
@@ -23,7 +23,7 @@ def run_lamni():  # noqa: C901
     from csaxs_bec.devices.sim.sim_lamni import SimLamniGalilMotor, SimRtLamniFlyer, SimRtLamniMotor
 
     dm = FakeDeviceManager()
-    host = "mpc2680.psi.ch"
+    host = "mpc-lamni.psi.ch"
     lsamx = dm.add(
         "lsamx",
         SimLamniGalilMotor(
diff --git a/tests/tests_devices/test_fupr_ophyd.py b/tests/tests_devices/test_fupr_ophyd.py
index 9e568563..a4373e2e 100644
--- a/tests/tests_devices/test_fupr_ophyd.py
+++ b/tests/tests_devices/test_fupr_ophyd.py
@@ -13,7 +13,7 @@ def fsamroy(dm_with_devices):
     fsamroy_motor = FuprGalilMotor(
         "A",
         name="fsamroy",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         socket_cls=SocketMock,
         device_manager=dm_with_devices,
diff --git a/tests/tests_devices/test_galil.py b/tests/tests_devices/test_galil.py
index ac49678e..e48f471b 100644
--- a/tests/tests_devices/test_galil.py
+++ b/tests/tests_devices/test_galil.py
@@ -29,7 +29,7 @@ def leyey(dm_with_devices):
     leyey_motor = LamniGalilMotor(
         "H",
         name="leyey",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         socket_cls=SocketMock,
         device_manager=dm_with_devices,
@@ -46,7 +46,7 @@ def leyex(dm_with_devices):
     leyex_motor = LamniGalilMotor(
         "A",
         name="leyey",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         socket_cls=SocketMock,
         device_manager=dm_with_devices,
@@ -214,7 +214,7 @@ def test_wait_for_connection_called(dm_with_devices):
                 args = ()
             kwargs = {
                 "name": "test_motor",
-                "host": "mpc2680.psi.ch",
+                "host": "mpc-lamni.psi.ch",
                 "port": 8081,
                 "device_manager": dm,
                 "socket_cls": SocketMock,
diff --git a/tests/tests_devices/test_galil_flomni.py b/tests/tests_devices/test_galil_flomni.py
index 64b09cb2..83f39f3d 100644
--- a/tests/tests_devices/test_galil_flomni.py
+++ b/tests/tests_devices/test_galil_flomni.py
@@ -12,7 +12,7 @@ def leyey(dm_with_devices):
     leyey_motor = FlomniGalilMotor(
         "H",
         name="leyey",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         socket_cls=SocketMock,
         device_manager=dm_with_devices,
@@ -29,7 +29,7 @@ def leyex(dm_with_devices):
     leyex_motor = FlomniGalilMotor(
         "H",
         name="leyey",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         socket_cls=SocketMock,
         device_manager=dm_with_devices,
@@ -177,7 +177,7 @@ def test_fosaz_light_curtain_is_triggered(
     fosaz = FlomniGalilMotor(
         axis_Id,
         name="fosaz",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8081,
         socket_cls=SocketMock,
         device_manager=dm_with_devices,
diff --git a/tests/tests_devices/test_lgalil_air_orchestra.py b/tests/tests_devices/test_lgalil_air_orchestra.py
index 5b1b0f31..a74d823c 100644
--- a/tests/tests_devices/test_lgalil_air_orchestra.py
+++ b/tests/tests_devices/test_lgalil_air_orchestra.py
@@ -13,7 +13,7 @@ from csaxs_bec.devices.omny.galil.lgalil_ophyd import LamniGalilController
 from csaxs_bec.devices.sim.sim_lamni import SimLamniGalilMotor
 from csaxs_bec.devices.sim.sim_socket import SimStateRegistry
 
-HOST = "mpc2680.psi.ch"
+HOST = "mpc-lamni.psi.ch"
 PORT = 8081
 
 
diff --git a/tests/tests_devices/test_lgalil_lamni_retry.py b/tests/tests_devices/test_lgalil_lamni_retry.py
index b6c43e16..35060201 100644
--- a/tests/tests_devices/test_lgalil_lamni_retry.py
+++ b/tests/tests_devices/test_lgalil_lamni_retry.py
@@ -18,7 +18,7 @@ from csaxs_bec.devices.omny.galil.lgalil_ophyd import LamniGalilController
 from csaxs_bec.devices.sim.sim_lamni import SimLamniGalilMotor
 from csaxs_bec.devices.sim.sim_socket import SimStateRegistry
 
-HOST = "mpc2680.psi.ch"
+HOST = "mpc-lamni.psi.ch"
 PORT = 8081
 
 
diff --git a/tests/tests_devices/test_smaract.py b/tests/tests_devices/test_smaract.py
index 3e77ca03..581e0f3e 100644
--- a/tests/tests_devices/test_smaract.py
+++ b/tests/tests_devices/test_smaract.py
@@ -26,7 +26,7 @@ def lsmarA(dm_with_devices):
     motor_a = SmaractMotor(
         "A",
         name="lsmarA",
-        host="mpc2680.psi.ch",
+        host="mpc-lamni.psi.ch",
         port=8085,
         sign=1,
         socket_cls=SocketMock,