diff --git a/backend/Makefile b/backend/Makefile
index 118d669..a8e4a05 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,43 +1,37 @@
 # Makefile for backend services
 
-.PHONY: build up down logs status dev-up dev-down gen-proto dev-start test
+.PHONY: dev build proto test down logs clean
+
+dev:
+	@echo "Starting development environment..."
+	@chmod +x ./scripts/gen-proto.sh ./scripts/dev-start.sh
+	@./scripts/dev-start.sh
 
 build:
-	docker-compose build
+	@echo "Building production environment..."
+	@docker-compose build
 
-build-dev:
-	docker-compose -f docker-compose.dev.yml build
-
-up:
-	docker-compose up -d
-
-dev-up:
-	docker-compose -f docker-compose.dev.yml up -d
-
-down:
-	docker-compose down
-
-dev-down:
-	docker-compose -f docker-compose.dev.yml down
-
-logs:
-	docker-compose logs -f
-
-dev-logs:
-	docker-compose -f docker-compose.dev.yml logs -f
-
-status:
-	docker-compose ps
-
-dev-status:
-	docker-compose -f docker-compose.dev.yml ps
-
-gen-proto:
-	chmod +x ./scripts/gen-proto.sh && ./scripts/gen-proto.sh
-
-dev-start:
-	chmod +x ./scripts/dev-start.sh && ./scripts/dev-start.sh
+proto:
+	@echo "Generating proto code..."
+	@chmod +x ./scripts/gen-proto.sh
+	@./scripts/gen-proto.sh
 
 test:
-	echo "Running tests..."
-	docker-compose -f docker-compose.dev.yml run --rm user-svc sh -c "go test ./..."
+	@echo "Running tests..."
+	@docker-compose -f docker-compose.dev.yml run --rm user-svc sh -c "go test ./..."
+
+down:
+	@echo "Stopping all services..."
+	@docker-compose down
+	@docker-compose -f docker-compose.dev.yml down
+
+logs:
+	@echo "Showing logs for development environment..."
+	@docker-compose -f docker-compose.dev.yml logs -f
+
+clean:
+	@echo "Cleaning up..."
+	@docker-compose down -v
+	@docker-compose -f docker-compose.dev.yml down -v
+	@rm -rf services/user-svc/user/* shared/proto/common/*
+	@echo "Cleanup completed!"