diff --git a/clearml_agent/backend_config/environment.py b/clearml_agent/backend_config/environment.py
index cc24209..fde68f4 100644
--- a/clearml_agent/backend_config/environment.py
+++ b/clearml_agent/backend_config/environment.py
@@ -55,7 +55,7 @@ def backward_compatibility_support():
                 continue
 
     # set OS environ:
-    keys = environ.keys()
+    keys = list(environ.keys())
     for k in keys:
         if not k.startswith('CLEARML_'):
             continue
diff --git a/clearml_agent/definitions.py b/clearml_agent/definitions.py
index ab0352a..c71db5f 100644
--- a/clearml_agent/definitions.py
+++ b/clearml_agent/definitions.py
@@ -64,6 +64,8 @@ class EnvironmentConfig(object):
 
 ENVIRONMENT_CONFIG = {
     "api.api_server": EnvironmentConfig("CLEARML_API_HOST", "TRAINS_API_HOST", ),
+    "api.files_server": EnvironmentConfig("CLEARML_FILES_HOST", "TRAINS_FILES_HOST", ),
+    "api.web_server": EnvironmentConfig("CLEARML_WEB_HOST", "TRAINS_WEB_HOST", ),
     "api.credentials.access_key": EnvironmentConfig(
         "CLEARML_API_ACCESS_KEY", "TRAINS_API_ACCESS_KEY",
     ),