diff --git a/flatland/evaluators/client.py b/flatland/evaluators/client.py
index 4ce29cf82e0eea6edd900fe9e65d6d9cdf65b83a..f400deaeaab20fb1d293eb972af6648457a83a6b 100644
--- a/flatland/evaluators/client.py
+++ b/flatland/evaluators/client.py
@@ -24,6 +24,12 @@ logger.setLevel(logging.INFO)
 m.patch()
 
 
+# CONSTANTS
+FLATLAND_RL_SERVICE_ID = os.getenv(
+    'AICROWD_SUBMISSION_ID',
+    'T12345')
+
+
 class TimeoutException(StopAsyncIteration):
     """ Custom exception for evaluation timeouts. """
     pass
@@ -46,11 +52,12 @@ class FlatlandRemoteClient(object):
     """
 
     def __init__(self,
+                 test_env_folder=None,
+                 flatland_rl_service_id=FLATLAND_RL_SERVICE_ID,
                  remote_host='127.0.0.1',
                  remote_port=6379,
                  remote_db=0,
                  remote_password=None,
-                 test_envs_root=None,
                  verbose=False,
                  use_pickle=False):
         self.use_pickle = use_pickle
@@ -66,21 +73,19 @@ class FlatlandRemoteClient(object):
         self.redis_conn = redis.Redis(connection_pool=self.redis_pool)
 
         self.namespace = "flatland-rl"
-        self.service_id = os.getenv(
-            'FLATLAND_RL_SERVICE_ID',
-            'FLATLAND_RL_SERVICE_ID'
-        )
+        self.service_id = flatland_rl_service_id
         self.command_channel = "{}::{}::commands".format(
             self.namespace,
             self.service_id
         )
-
         # for timeout messages sent out-of-band
         self.error_channel = "{}::{}::errors".format(
-            self.namespace, self.service_id)
+            self.namespace, 
+            self.service_id
+        )
 
-        if test_envs_root:
-            self.test_envs_root = test_envs_root
+        if test_env_folder:
+            self.test_envs_root = test_env_folder
         else:
             self.test_envs_root = os.getenv(
                 'AICROWD_TESTS_FOLDER',
diff --git a/flatland/evaluators/service.py b/flatland/evaluators/service.py
index a7dc15902b5d3d7a47e3b26a544a33c650c29a41..1afa089e5766465ff5b7206b57d2e3e65652e37d 100644
--- a/flatland/evaluators/service.py
+++ b/flatland/evaluators/service.py
@@ -44,6 +44,10 @@ m.patch()
 # CONSTANTS
 ########################################################
 
+FLATLAND_RL_SERVICE_ID = os.getenv(
+    'AICROWD_SUBMISSION_ID',
+    'T12345')
+
 # Don't proceed to next Test if the previous one didn't reach this mean completion percentage
 TEST_MIN_PERCENTAGE_COMPLETE_MEAN = float(os.getenv("TEST_MIN_PERCENTAGE_COMPLETE_MEAN", 0.25))
 
@@ -109,7 +113,7 @@ class FlatlandRemoteEvaluationService:
     def __init__(
         self,
         test_env_folder="/tmp",
-        flatland_rl_service_id='FLATLAND_RL_SERVICE_ID',
+        flatland_rl_service_id=FLATLAND_RL_SERVICE_ID,
         remote_host='127.0.0.1',
         remote_port=6379,
         remote_db=0,