diff --git a/src/helpers.py b/src/helpers.py
index 4289e9f5b6f0ec688d6ffa23b29338ec2be3ca58..2ab628d739989f32735d5289d92c09a494cf5166 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -99,7 +99,7 @@ class TimeTracking(object):
 
 def prepare_host(create_new=True, sampling="daily"):
     hostname = socket.gethostname()
-    runner_regex = re.compile(r"runner-.*-project-2411-concurrent-?\d+")
+    runner_regex = re.compile(r"runner-.*-project-2411-concurrent-\d+")
     try:
         user = os.getlogin()
     except OSError:
diff --git a/test/test_helpers.py b/test/test_helpers.py
index 623c0bf8b1bec735ab422e31c0e5783b5c711a3a..0c0dd8c31c57ff4f6221842a899b85570aed81a2 100644
--- a/test/test_helpers.py
+++ b/test/test_helpers.py
@@ -131,7 +131,7 @@ class TestTimeTracking:
 class TestPrepareHost:
 
     @mock.patch("socket.gethostname", side_effect=["linux-aa9b", "ZAM144", "zam347", "jrtest", "jwtest",
-                                                   "runner-6HmDp9Qd-project-2411-concurrent"])
+                                                   "runner-6HmDp9Qd-project-2411-concurrent-01"])
     @mock.patch("os.getlogin", return_value="testUser")
     @mock.patch("os.path.exists", return_value=True)
     def test_prepare_host(self, mock_host, mock_user, mock_path):