diff --git a/Makefile b/Makefile
index f4c3556..70e18ba 100644
--- a/Makefile
+++ b/Makefile
@@ -163,16 +163,34 @@ validate-k8s: ## Validate Kubernetes configurations
 
 ##@ Configuration
 
-generate-config: ## Generate configuration for all environments
-	@printf "$(BLUE)Generating configurations...$(RESET)\n"
-	@./scripts/generate-config.sh dev 2>/dev/null || true
-	@./scripts/generate-config.sh prod 2>/dev/null || true
-	@./scripts/generate-config.sh staging 2>/dev/null || true
-	@printf "$(GREEN)Configurations generated!$(RESET)\n"
+generate-config: ## Generate configuration for all environments using unified config
+	@printf "$(BLUE)Generating unified configurations...$(RESET)\n"
+	@bun scripts/generate-unified-config.ts --all
+	@printf "$(GREEN)Unified configurations generated!$(RESET)\n"
 
-validate-config: ## Validate generated configuration
-	@printf "$(BLUE)Validating configuration...$(RESET)\n"
-	@./scripts/generate-config.sh --validate 2>/dev/null || printf "$(YELLOW)Config validation not available$(RESET)\n"
+generate-config-dev: ## Generate configuration for development environment
+	@printf "$(BLUE)Generating development configuration...$(RESET)\n"
+	@bun scripts/generate-unified-config.ts development
+	@printf "$(GREEN)Development configuration generated!$(RESET)\n"
+
+generate-config-staging: ## Generate configuration for staging environment
+	@printf "$(BLUE)Generating staging configuration...$(RESET)\n"
+	@bun scripts/generate-unified-config.ts staging
+	@printf "$(GREEN)Staging configuration generated!$(RESET)\n"
+
+generate-config-prod: ## Generate configuration for production environment
+	@printf "$(BLUE)Generating production configuration...$(RESET)\n"
+	@bun scripts/generate-unified-config.ts production
+	@printf "$(GREEN)Production configuration generated!$(RESET)\n"
+
+validate-config: ## Validate unified configuration
+	@printf "$(BLUE)Validating unified configuration...$(RESET)\n"
+	@bun scripts/generate-unified-config.ts --dry-run
+	@printf "$(GREEN)Configuration validation completed!$(RESET)\n"
+
+config-debug: ## Show current unified configuration (debug mode)
+	@printf "$(BLUE)Current unified configuration:$(RESET)\n"
+	@bun -e "import { logConfig } from './config/unified.config.ts'; logConfig();"
 
 ##@ Workflows