diff --git a/docker/docker-compose-win10.yml b/docker/docker-compose-win10.yml
index 7098270..767e739 100644
--- a/docker/docker-compose-win10.yml
+++ b/docker/docker-compose-win10.yml
@@ -10,6 +10,7 @@ services:
     volumes:
     - c:/opt/clearml/logs:/var/log/trains
     - c:/opt/clearml/config:/opt/trains/config
+    - c:/opt/clearml/data/fileserver:/mnt/fileserver
     depends_on:
       - redis
       - mongo
@@ -23,8 +24,9 @@ services:
       TRAINS_REDIS_SERVICE_HOST: redis
       TRAINS_REDIS_SERVICE_PORT: 6379
       TRAINS_SERVER_DEPLOYMENT_TYPE: ${TRAINS_SERVER_DEPLOYMENT_TYPE:-win10}
-      TRAINS__apiserver__mongo__pre_populate__enabled: "true"
-      TRAINS__apiserver__mongo__pre_populate__zip_file: "/opt/clearml/db-pre-populate/export.zip"
+      TRAINS__apiserver__pre_populate__enabled: "true"
+      TRAINS__apiserver__pre_populate__zip_files: "/opt/trains/db-pre-populate"
+      TRAINS__apiserver__pre_populate__artifacts_path: "/mnt/fileserver"
     ports:
     - "8008:8008"
     networks:
@@ -61,7 +63,8 @@ services:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
     restart: unless-stopped
     volumes:
-    - c:/opt/clearml/data/elastic_7:/usr/share/elasticsearch/data
+      - c:/opt/clearml/data/elastic_7:/usr/share/elasticsearch/data
+      - /usr/share/elasticsearch/logs
 
   fileserver:
     networks:
@@ -113,10 +116,12 @@ services:
     ports:
     - "8080:80"
     networks:
+      - backend
       - frontend
 
 networks:
   backend:
     driver: bridge
   frontend:
-    name: frontend
\ No newline at end of file
+    name: frontend
+    driver: bridge
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a069dd8..86d2303 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -63,11 +63,13 @@ services:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
     restart: unless-stopped
     volumes:
-    - /opt/clearml/data/elastic_7:/usr/share/elasticsearch/data
+      - /opt/clearml/data/elastic_7:/usr/share/elasticsearch/data
+      - /usr/share/elasticsearch/logs
 
   fileserver:
     networks:
       - backend
+      - frontend
     command:
     - fileserver
     container_name: clearml-fileserver
@@ -117,32 +119,32 @@ services:
   agent-services:
     networks:
       - backend
-    container_name: trains-agent-services
-    image: allegroai/trains-agent-services:latest
+    container_name: clearml-agent-services
+    image: allegroai/clearml-agent-services:latest
     restart: unless-stopped
     privileged: true
     environment:
-      TRAINS_HOST_IP: ${TRAINS_HOST_IP}
-      TRAINS_WEB_HOST: ${TRAINS_WEB_HOST:-}
-      TRAINS_API_HOST: http://apiserver:8008
-      TRAINS_FILES_HOST: ${TRAINS_FILES_HOST:-}
-      TRAINS_API_ACCESS_KEY: ${TRAINS_API_ACCESS_KEY:-}
-      TRAINS_API_SECRET_KEY: ${TRAINS_API_SECRET_KEY:-}
-      TRAINS_AGENT_GIT_USER: ${TRAINS_AGENT_GIT_USER}
-      TRAINS_AGENT_GIT_PASS: ${TRAINS_AGENT_GIT_PASS}
-      TRAINS_AGENT_UPDATE_VERSION: ${TRAINS_AGENT_UPDATE_VERSION:->=0.15.0}
-      TRAINS_AGENT_DEFAULT_BASE_DOCKER: "ubuntu:18.04"
+      CLEARML_HOST_IP: ${CLEARML_HOST_IP}
+      CLEARML_WEB_HOST: ${CLEARML_WEB_HOST:-}
+      CLEARML_API_HOST: http://apiserver:8008
+      CLEARML_FILES_HOST: ${CLEARML_FILES_HOST:-}
+      CLEARML_API_ACCESS_KEY: ${CLEARML_API_ACCESS_KEY:-}
+      CLEARML_API_SECRET_KEY: ${CLEARML_API_SECRET_KEY:-}
+      CLEARML_AGENT_GIT_USER: ${CLEARML_AGENT_GIT_USER}
+      CLEARML_AGENT_GIT_PASS: ${CLEARML_AGENT_GIT_PASS}
+      CLEARML_AGENT_UPDATE_VERSION: ${CLEARML_AGENT_UPDATE_VERSION:->=0.17.0}
+      CLEARML_AGENT_DEFAULT_BASE_DOCKER: "ubuntu:18.04"
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-}
       AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-}
       AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT:-}
       AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY:-}
       GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS:-}
-      TRAINS_WORKER_ID: "trains-services"
-      TRAINS_AGENT_DOCKER_HOST_MOUNT: "/opt/trains/agent:/root/.trains"
+      CLEARML_WORKER_ID: "clearml-services"
+      CLEARML_AGENT_DOCKER_HOST_MOUNT: "/opt/clearml/agent:/root/.clearml"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /opt/clearml/agent:/root/.trains
+      - /opt/clearml/agent:/root/.clearml
     depends_on:
       - apiserver
 
diff --git a/webserver/README.md b/webserver/README.md
index f241693..9811ece 100644
--- a/webserver/README.md
+++ b/webserver/README.md
@@ -2,14 +2,14 @@
 
 ## Introduction
 
-The webserver is the **trains-server**'s component responsible for serving the Trains webapp.
+The webserver is the **clearml-server**'s component responsible for serving the Trains webapp.
 For this purpose, we use an [NGINX](https://www.nginx.com/) server.
 
 ## Configuration
 
-In order to serve the Trains webapp, the following is required:
-* The pre-built Trains webapp should be copied to the NGINX html directory (usually `/usr/share/nginx/html`)
-* The default NGINX port (usually `80`) should be changed to match the **trains-server** configuration (usually `8080`)
+In order to serve the ClearML webapp, the following is required:
+* The pre-built ClearML webapp should be copied to the NGINX html directory (usually `/usr/share/nginx/html`)
+* The default NGINX port (usually `80`) should be changed to match the **clearml-server** configuration (usually `8080`)
 
 NOTE: This configuration may vary in different systems, depending on the NGINX version and distribution used.
 
@@ -18,7 +18,7 @@ NOTE: This configuration may vary in different systems, depending on the NGINX v
 The following commands can be used to install and run NGINX in the Centos 7 OS:
 ```bash
 yum install nginx
-cp -R /path/to/trains-webapp/build/* /var/www/html
+cp -R /path/to/clearml-webapp/build/* /var/www/html
 systemctl enable nginx
 systemctl start nginx
 ```