diff --git a/.env.example b/.env.example
index d8011cb..8e7101c 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,10 @@
-DB_PORT=12345
-DB_API_PORT=12346
-TELEMSG_API_PORT=12347
-WEB_API_PORT=12348
-TELEGRAM_TOKEN=123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11
-TELEGRAM_ADMIN_ID=123456789
+POSTGRES_DB=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+DB_PORT=
+DB_API_PORT=
+TELEMSG_API_PORT=
+WEB_API_PORT=
+FRONTEND_API_PORT=
+TELEGRAM_TOKEN=
+TELEGRAM_ADMIN_ID=
diff --git a/docker-compose.yml b/docker-compose.yml
index 8859178..ed9fea4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,15 +3,14 @@ version: '3.3'
 services:
   db:
     image: postgres:9.5
-    container_name: evs_postgres
     volumes:
       - "${HOME}/docker/volumes/postgres:/var/lib/postgresql/data"
     ports:
       - "${DB_PORT}:5432"
     environment:
-      POSTGRES_DB: "evs"
-      POSTGRES_USER: "postgres"
-      POSTGRES_PASSWORD: "docker"
+      POSTGRES_DB: "${POSTGRES_DB}"
+      POSTGRES_USER: "${POSTGRES_USER}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
     restart: "on-failure"
 
 
@@ -21,7 +20,6 @@ services:
       - web_api
     build: apis/db
     image: evs-db-api:latest
-    container_name: evs_db_api
     ports:
       - "${DB_API_PORT}:8080"
     environment:
@@ -34,7 +32,6 @@ services:
   telemsg_api:
     build: apis/telemsg
     image: evs-telemsg-api:latest
-    container_name: evs_telemsg_api
     ports:
       - "${TELEMSG_API_PORT}:8080"
     environment:
@@ -45,7 +42,6 @@ services:
   web_api:
     build: apis/web
     image: evs-web-api:latest
-    container_name: evs_web_api
     ports:
       - "${WEB_API_PORT}:8080"
     restart: "on-failure"
@@ -56,7 +52,6 @@ services:
       - web_api
     build: apis/front
     image: evs-front-api:latest
-    container_name: evs_front_api
     ports:
       - "${FRONTEND_API_PORT}:8080"
     environment:
@@ -73,7 +68,6 @@ services:
       - web_api
     build: hosts/telebot
     image: evs-telebot:latest
-    container_name: evs_telebot
     environment:
       TELEGRAM_TOKEN: "${TELEGRAM_TOKEN}"
       DB_API_HOST: "db_api"