diff --git a/docker-compose.yml b/docker-compose.yml
index 797a9cf..13d3b58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,31 @@
 version: '3.7'
 
 services:
-  rss-bot:
+  app:
     image: miroslavsckaya/tg_rss_bot
     environment:
       # DSN schema: postgres://username:password@hostname/database_name
       # https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
-      - "RSSBOT_DSN=${BOT_DSN}"
+      - "RSSBOT_DSN=postgres://${BOT_DB_USER:-bot}:${BOT_DB_PASSWORD:-dev}@${BOT_DB_HOST:-db}/${BOT_DB_NAME:-bot}"
       # https://core.telegram.org/bots#6-botfather
-      - "RSSBOT_TG_TOKEN=${BOT_TOKEN}"
+      - "RSSBOT_TG_TOKEN=${RSSBOT_TG_TOKEN}"
       # https://docs.python.org/3/howto/logging.html#logging-levels
-      - "LOG_LEVEL=${BOT_LOG_LEVEL:-INFO}"
-    container_name: rss_bot
+      - "LOG_LEVEL=${LOG_LEVEL:-INFO}"
     depends_on: 
       - postgres
+    restart: unless-stopped
 
-  postgres:
+  db:
     image: postgres:14-alpine
     environment:
       # Postgres settings
-      # Can use POSTGRES_DB variable. https://hub.docker.com/_/postgres
-      - "POSTGRES_PASSWORD=${POSTGRES_PASS}"
+      # https://hub.docker.com/_/postgres
+      - "POSTGRES_USER=${BOT_DB_USER:-bot}"
+      - "POSTGRES_PASSWORD=${BOT_DB_PASSWORD:-dev}"
+      - "POSTGRES_DB=${BOT_DB_NAME:-bot}"
     volumes:
       - postgres_bot_db:/var/lib/postgresql/data
+    restart: unless-stopped
   
 volumes:
   postgres_bot_db: