diff --git a/Makefile b/Makefile
index cfeaf72..59c7929 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
+.SHELLFLAGS := -ec
+
 prod:
 	docker compose down
 	docker compose --env-file .env -f ./compose.yaml -f ./.docker-compose-files/compose.prod.yaml up -d --build 
-	docker exec quatsh-website-web-1 python manage.py collectstatic --noinput
-	docker exec quatsh-website-web-1 python manage.py check --deploy
-	docker exec quatsh-website-web-1 python manage.py migrate
+	docker compose exec web python manage.py collectstatic --noinput
+	docker compose exec web python manage.py check --deploy
+	docker compose exec web python manage.py migrate
 
 dev:
 	docker compose down
 	docker compose -f ./compose.yaml -f ./.docker-compose-files/compose.dev.yaml up --build -d
-	docker exec quatsh-website-web-1 python manage.py collectstatic --noinput
-	docker exec -it quatsh-website-web-1 sh
+	docker compose exec web python manage.py collectstatic --noinput
+	docker compose exec -it web sh
 
 dev_restart:
 	docker compose down
 	docker compose -f ./compose.yaml -f ./.docker-compose-files/compose.dev.yaml up -d
-	docker exec -it quatsh-website-web-1 sh
+	docker compose exec -it web sh
 
 dev_restart_with_logs:
 	docker compose down