diff --git a/README.rst b/README.rst
index c7a5c22c2594009100c92d91e496feb427fe9526..98909b690a9239fbf0077e4ecc688522b8811a83 100644
--- a/README.rst
+++ b/README.rst
@@ -473,7 +473,7 @@ https://git.xfel.eu/gitlab/detectors/pycalibration repository, so now
 
 .. code::
 
-  [xcaltst@max-exfl-cal-002 tmp]$ git clone ssh://git@git.xfel.eu:10022/detectors/pycalibration.git
+  [xcaltst@max-exfl-cal002 tmp]$ git clone ssh://git@git.xfel.eu:10022/detectors/pycalibration.git
   Cloning into 'pycalibration'...
   remote: Enumerating objects: 9414, done.
   remote: Counting objects: 100% (9414/9414), done.
diff --git a/tests/conftest.py b/tests/conftest.py
index 7ad10cc5b4191745150d6a897f7c162c4916b638..3c34eb25f4e2668daf2695f34db0b36d052ec3f6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -69,7 +69,7 @@ def pytest_configure(config):
 
 
 @lru_cache()
-def server_reachable(server: str = "max-exfl-cal-002"):
+def server_reachable(server: str = "max-exfl-cal002"):
     reachable = True
 
     try:
diff --git a/tests/test_cal_tools.py b/tests/test_cal_tools.py
index 128921179817d1bb27df4bbaeceb80e85875283a..2eb84eac7cb6d62ee6f61c714e4c73179be1115f 100644
--- a/tests/test_cal_tools.py
+++ b/tests/test_cal_tools.py
@@ -36,8 +36,8 @@ PHOTON_ENERGY = 9.2
 AGIPD_KARABO_ID = "SPB_DET_AGIPD1M-1"
 WRONG_AGIPD_MODULE = "AGIPD_**"
 
-CAL_DB_INTERFACE = "tcp://max-exfl-cal-002:8020"
-WRONG_CAL_DB_INTERFACE = "tcp://max-exfl-cal-002:0000"
+CAL_DB_INTERFACE = "tcp://max-exfl-cal002:8020"
+WRONG_CAL_DB_INTERFACE = "tcp://max-exfl-cal002:0000"
 
 PROPOSAL = 900113
 
diff --git a/webservice/README.md b/webservice/README.md
index cfd7a10bfac4a26064e93e39dbb26beb0c501ecf..aecce1822ecaf50f7bce16139cc222cbd01ddd3e 100644
--- a/webservice/README.md
+++ b/webservice/README.md
@@ -159,11 +159,11 @@ to display a list of available options.
 Testing
 -------
 
-There is a test environment on ``max-exfl-cal-002``, separate from the production
+There is a test environment on ``max-exfl-cal002``, separate from the production
 instance.
 
 ```bash
-ssh xcaltst@max-exfl-cal-002.desy.de
+ssh xcaltst@max-exfl-cal002.desy.de
 cd /home/xcaltst/pycalibration
 
 # Get the code you want to test
diff --git a/webservice/request_repeat.py b/webservice/request_repeat.py
index 69f5507e0abc575127800f0a928969abd1e3d7c5..f05b96ee6e8a021796edc83a27a2bf441cc06726 100644
--- a/webservice/request_repeat.py
+++ b/webservice/request_repeat.py
@@ -14,7 +14,7 @@ parser.add_argument('proposal', type=int, help='The proposal number')
 parser.add_argument('run', type=int, help='The run number')
 parser.add_argument('--mymdc-id', type=int, default=0, help="Run ID in myMdC")
 parser.add_argument('--endpoint', default='tcp://max-exfl-cal001:5555',
-                help="The ZMQ endpoint to connect to (max-exfl-cal-002 for testing)")
+                help="The ZMQ endpoint to connect to (max-exfl-cal002 for testing)")
 
 args = parser.parse_args()