diff --git a/docker/docker-compose-win10.yml b/docker/docker-compose-win10.yml
index 767e739..499f89f 100644
--- a/docker/docker-compose-win10.yml
+++ b/docker/docker-compose-win10.yml
@@ -8,8 +8,8 @@ services:
     image: allegroai/clearml:latest
     restart: unless-stopped
     volumes:
-    - c:/opt/clearml/logs:/var/log/trains
-    - c:/opt/clearml/config:/opt/trains/config
+    - c:/opt/clearml/logs:/var/log/clearml
+    - c:/opt/clearml/config:/opt/clearml/config
     - c:/opt/clearml/data/fileserver:/mnt/fileserver
     depends_on:
       - redis
@@ -17,16 +17,16 @@ services:
       - elasticsearch
       - fileserver
     environment:
-      TRAINS_ELASTIC_SERVICE_HOST: elasticsearch
-      TRAINS_ELASTIC_SERVICE_PORT: 9200
-      TRAINS_MONGODB_SERVICE_HOST: mongo
-      TRAINS_MONGODB_SERVICE_PORT: 27017
-      TRAINS_REDIS_SERVICE_HOST: redis
-      TRAINS_REDIS_SERVICE_PORT: 6379
-      TRAINS_SERVER_DEPLOYMENT_TYPE: ${TRAINS_SERVER_DEPLOYMENT_TYPE:-win10}
-      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"
+      CLEARML_ELASTIC_SERVICE_HOST: elasticsearch
+      CLEARML_ELASTIC_SERVICE_PORT: 9200
+      CLEARML_MONGODB_SERVICE_HOST: mongo
+      CLEARML_MONGODB_SERVICE_PORT: 27017
+      CLEARML_REDIS_SERVICE_HOST: redis
+      CLEARML_REDIS_SERVICE_PORT: 6379
+      CLEARML_SERVER_DEPLOYMENT_TYPE: ${CLEARML_SERVER_DEPLOYMENT_TYPE:-win10}
+      CLEARML__apiserver__pre_populate__enabled: "true"
+      CLEARML__apiserver__pre_populate__zip_files: "/opt/clearml/db-pre-populate"
+      CLEARML__apiserver__pre_populate__artifacts_path: "/mnt/fileserver"
     ports:
     - "8008:8008"
     networks:
@@ -76,9 +76,9 @@ services:
     image: allegroai/clearml:latest
     restart: unless-stopped
     volumes:
-    - c:/opt/clearml/logs:/var/log/trains
+    - c:/opt/clearml/logs:/var/log/clearml
     - c:/opt/clearml/data/fileserver:/mnt/fileserver
-    - c:/opt/clearml/config:/opt/trains/config
+    - c:/opt/clearml/config:/opt/clearml/config
 
     ports:
     - "8081:8081"
@@ -110,7 +110,7 @@ services:
     image: allegroai/clearml:latest
     restart: unless-stopped
     volumes:
-    - c:/clearml/logs:/var/log/trains
+    - c:/clearml/logs:/var/log/clearml
     depends_on:
       - apiserver
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 86d2303..5375629 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -8,8 +8,8 @@ services:
     image: allegroai/clearml:latest
     restart: unless-stopped
     volumes:
-    - /opt/clearml/logs:/var/log/trains
-    - /opt/clearml/config:/opt/trains/config
+    - /opt/clearml/logs:/var/log/clearml
+    - /opt/clearml/config:/opt/clearml/config
     - /opt/clearml/data/fileserver:/mnt/fileserver
     depends_on:
       - redis
@@ -17,16 +17,16 @@ services:
       - elasticsearch
       - fileserver
     environment:
-      TRAINS_ELASTIC_SERVICE_HOST: elasticsearch
-      TRAINS_ELASTIC_SERVICE_PORT: 9200
-      TRAINS_MONGODB_SERVICE_HOST: mongo
-      TRAINS_MONGODB_SERVICE_PORT: 27017
-      TRAINS_REDIS_SERVICE_HOST: redis
-      TRAINS_REDIS_SERVICE_PORT: 6379
-      TRAINS_SERVER_DEPLOYMENT_TYPE: ${TRAINS_SERVER_DEPLOYMENT_TYPE:-linux}
-      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"
+      CLEARML_ELASTIC_SERVICE_HOST: elasticsearch
+      CLEARML_ELASTIC_SERVICE_PORT: 9200
+      CLEARML_MONGODB_SERVICE_HOST: mongo
+      CLEARML_MONGODB_SERVICE_PORT: 27017
+      CLEARML_REDIS_SERVICE_HOST: redis
+      CLEARML_REDIS_SERVICE_PORT: 6379
+      CLEARML_SERVER_DEPLOYMENT_TYPE: ${CLEARML_SERVER_DEPLOYMENT_TYPE:-linux}
+      CLEARML__apiserver__pre_populate__enabled: "true"
+      CLEARML__apiserver__pre_populate__zip_files: "/opt/clearml/db-pre-populate"
+      CLEARML__apiserver__pre_populate__artifacts_path: "/mnt/fileserver"
     ports:
     - "8008:8008"
     networks:
@@ -76,9 +76,9 @@ services:
     image: allegroai/clearml:latest
     restart: unless-stopped
     volumes:
-    - /opt/clearml/logs:/var/log/trains
+    - /opt/clearml/logs:/var/log/clearml
     - /opt/clearml/data/fileserver:/mnt/fileserver
-    - /opt/clearml/config:/opt/trains/config
+    - /opt/clearml/config:/opt/clearml/config
     ports:
     - "8081:8081"