diff --git a/Makefile b/Makefile
index 749e4c70052b05507db904aa5a98571393a69499..49e49d2ebf4f7566af4b4c0d23f0f1d714aed299 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ service: build_service
 
 ## Wait until postgres is up
 service_wait:
-	@docker exec -it telegram_system_bot make wait_resources
+	@docker exec -i telegram_system_bot make wait_resources
 
 _run_local:
 	@docker-compose up -d
@@ -39,11 +39,11 @@ rm:
 	@docker-compose  down -v
 
 ## Clean all containers
-clean_service:
+clean_prod:
 	@docker-compose -f docker-compose.prod.yml down
 
 ## Remove containers and volumes
-rm_service:
+rm_prod:
 	@docker-compose -f docker-compose.prod.yml down -v
 
 ## Runs PostgreSQL UI. | Database
@@ -61,7 +61,7 @@ migrations:
 
 ## Upgrades database.
 migrate:
-	@docker exec -it telegram_system_bot alembic upgrade head;
+	@docker exec -i telegram_system_bot alembic upgrade head;
 
 ## Waits postgresql to be online
 wait_resources:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 6c67577af5346dc0b2188c0c93695ea4fa48f641..71aa015cf001149280d751b3ace80dda5e562838 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -24,6 +24,8 @@ services:
     networks:
       - system_bot_network
     command: make _run_bot
+    depends_on:
+      - system_bot_postgres
 
   system_bot_postgres:
     container_name: 'system_bot_postgres'
diff --git a/docker-compose.yml b/docker-compose.yml
index 94c168489e64c481e83ae6279ed26a196119a8c0..2b3e15ce8cb13932af9d68f81a0d6f2d6cca4136 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,8 @@ services:
     networks:
       - dev_system_bot_network
     command: make _dev_run_bot
+    depends_on:
+      - system_bot_postgres
 
   system_bot_postgres:
     container_name: 'system_bot_postgres'
diff --git a/systemd/bot_sys_admin.service b/systemd/bot_sys_admin.service
index 67fea8f7c15d73b4f38b41d7079c594f93536771..6643e3d6ffd3d3efb96525cc938ce31207d2ea39 100644
--- a/systemd/bot_sys_admin.service
+++ b/systemd/bot_sys_admin.service
@@ -7,7 +7,7 @@ Type=simple
 User=bots
 WorkingDirectory=/home/bots/repos/system_admin
 ExecStart=/bin/bash -c 'make prod'
-ExecStop=/bin/bash -c 'make clean'
+ExecStop=/bin/bash -c 'make clean_prod'
 Restart=on-abort
 
 [Install]