diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdc7adf..e2e255f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,8 @@ deploy-dev:
     DB_HOST: "82.146.35.103"
     RABBIT_HOST: "82.146.35.103"
     FS_HOST: "82.146.35.103"
+    DB_PASSWORD: "$DB_PASSWORD_DEMO
+    "
     DEBUG: "true"
     TELEGRAM_TOKEN: "$TELEGRAM_TOKEN_DEMO"
 
@@ -58,4 +60,5 @@ deploy-prod:
     DB_HOST: "77.246.159.65"
     RABBIT_HOST: "77.246.159.65"
     FS_HOST: "77.246.159.65"
+    DB_PASSWORD: "$DB_PASSWORD"
     TELEGRAM_TOKEN: "$TELEGRAM_TOKEN"
diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml
index f12de6f..c21e75b 100644
--- a/docker-compose-deploy.yaml
+++ b/docker-compose-deploy.yaml
@@ -7,7 +7,7 @@ services:
     image: local_postgres
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+      POSTGRES_PASSWORD: $DB_PASSWORD
       POSTGRES_DB: sprint
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
@@ -42,6 +42,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -65,6 +66,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -84,6 +86,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -102,6 +105,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -123,6 +127,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -140,6 +145,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -165,6 +171,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
@@ -185,6 +192,7 @@ services:
       PORT: 80
       SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
       DB_HOST: $DB_HOST
+      DB_PASSWORD: $DB_PASSWORD
       RABBIT_HOST: $RABBIT_HOST
       FS_HOST: $FS_HOST
       DEBUG: $DEBUG
diff --git a/docker-compose-infra.yaml b/docker-compose-infra.yaml
deleted file mode 100644
index a89d10b..0000000
--- a/docker-compose-infra.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "3"
-
-
-services:
-
-  postgres:
-    restart: always
-    build:
-      context: .
-      dockerfile: dockerfiles/postgres/Dockerfile
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-      POSTGRES_DB: sprint
-    volumes:
-      - /sprint-data/postgres-data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-
-  storage:
-    restart: always
-    image: mathwave/sprint-repo:sprint
-    command: ./manage.py storage
-    ports:
-      - "5555:5555"
-    volumes:
-      - /sprint-data/data:/usr/src/app/data
-
-  rabbitmq:
-    restart: always
-    build:
-      context: .
-      dockerfile: dockerfiles/rabbitmq/Dockerfile
-    ports:
-      - "15672:15672"
-      - "5672:5672"
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index 0f51666..0000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-version: "3"
-
-
-services:
-
-  postgres:
-    restart: always
-    build:
-      context: .
-      dockerfile: dockerfiles/postgres/Dockerfile
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-      POSTGRES_DB: sprint
-    volumes:
-      - /sprint-data/postgres-data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-
-  migrations:
-    image: mathwave/sprint-repo:sprint
-    command: ./manage.py migrate
-    depends_on:
-      - postgres
-
-  web:
-    image: mathwave/sprint-repo:sprint
-    restart: always
-    environment:
-      PORT: $PORT
-      HOST: $HOST
-      debug: "false"
-    command: ./manage.py runserver 0.0.0.0:$PORT --noreload
-    ports:
-      - "${PORT}:${PORT}"
-    depends_on:
-      - migrations
-      - rabbitmq
-      - storage
-
-  storage:
-    restart: always
-    image: mathwave/sprint-repo:sprint
-    command: ./manage.py storage
-    ports:
-      - "5555:5555"
-    volumes:
-      - /sprint-data/data:/usr/src/app/data
-
-  bot:
-    image: mathwave/sprint-repo:sprint
-    restart: always
-    environment:
-      HOST: $HOST
-    command: ./manage.py bot
-    depends_on:
-      - web
-
-  loop:
-    image: mathwave/sprint-repo:sprint
-    restart: always
-    environment:
-      HOST: $HOST
-    command: ./manage.py loop
-    depends_on:
-      - web
-
-  rabbitmq:
-    restart: always
-    build:
-      context: .
-      dockerfile: dockerfiles/rabbitmq/Dockerfile
-    ports:
-      - "15672:15672"
-      - "5672:5672"
-
-  worker:
-    restart: always
-    image: mathwave/sprint-repo:sprint
-    privileged: true
-    command: ./manage.py receive
-    environment:
-      SOLUTIONS_ROOT_EXTERNAL: "${SOLUTIONS_ROOT_EXTERNAL}"
-      HOST: $HOST
-    depends_on:
-      - web
-      - rabbitmq
-      - migrations
-      - storage
-    volumes:
-      - /sprint-data/solutions:/usr/src/app/solutions
-      - /var/run/docker.sock:/var/run/docker.sock
-
-  apply-languages:
-    image: mathwave/sprint-repo:sprint
-    command: ./manage.py apply_languages
-    depends_on:
-      - migrations
-      - web
-      - postgres
-
-  notify-admin:
-    image: mathwave/sprint-repo:sprint
-    command: ./manage.py success_deploy
-    depends_on:
-      - migrations
-      - web
-      - worker
-      - storage
-      - rabbitmq
-      - bot
-      - postgres
-      - apply-languages
-      - loop