diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 7980467..f1c4f1e 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -104,7 +104,7 @@ services:
     build:
       context: ./frontend
       args:
-        - VITE_API_URL=https://service.furyhawk.lol
+        - VITE_API_URL=http://localhost:8000
         - NODE_ENV=development
 
   playwright:
@@ -115,8 +115,8 @@ services:
       context: ./frontend
       dockerfile: Dockerfile.playwright
       args:
-        - VITE_API_URL=https://service.furyhawk.lol
-        - NODE_ENV=production
+        - VITE_API_URL=http://localhost:8000
+        - NODE_ENV=development
     ipc: host
     depends_on:
       - backend
@@ -124,8 +124,8 @@ services:
     env_file:
       - .env
     environment:
-      - VITE_API_URL=https://service.furyhawk.lol
-      - MAILCATCHER_HOST=https://mail.furyhawk.lol
+      - VITE_API_URL=http://localhost:8000
+      - MAILCATCHER_HOST=http://localhost:1080
       # For the reports when run locally
       - PLAYWRIGHT_HTML_HOST=0.0.0.0
       - CI=${CI}
diff --git a/makefile b/makefile
index 06f3cf1..a438f80 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ include $(ENV_FILE)
 export
 
 # Targets
-.PHONY: up up-e2e down restart logs build reset network clean prune backup restore help info ollama-build ollama-build-host ollama-up ollama-down ollama-logs pull-deepseek-model setup-ollama llamacpp-build llamacpp-build-host llamacpp-up llamacpp-down llamacpp-logs pull-deepseek-llamacpp setup-llamacpp llamacpp-gpu ai-launcher
+.PHONY: up up-e2e down restart logs build reset network deploy-local deploy-production clean prune backup restore help info ollama-build ollama-build-host ollama-up ollama-down ollama-logs pull-deepseek-model setup-ollama llamacpp-build llamacpp-build-host llamacpp-up llamacpp-down llamacpp-logs pull-deepseek-llamacpp setup-llamacpp llamacpp-gpu ai-launcher
 
 network:
 	@podman network exists traefik-public || podman network create traefik-public
@@ -53,6 +53,14 @@ reset:
 	podman pod prune -f
 	@echo "Environment completely reset. Use 'make build' then 'make up' to recreate."
 
+deploy-local: network
+	podman compose --env-file $(ENV_FILE) -f docker-compose.yml -f docker-compose.override.yml up -d --build
+	@echo "Local deployment completed using docker-compose.yml + docker-compose.override.yml"
+
+deploy-production: network
+	podman compose --env-file $(ENV_FILE) -f docker-compose.yml up -d --build
+	@echo "Production deployment completed using docker-compose.yml"
+
 backup:
 	@mkdir -p $(BACKUP_DIR)
 	$(eval TIMESTAMP := $(shell date +%Y%m%d_%H%M%S))
@@ -102,6 +110,8 @@ help:
 	@echo "  make build                Build backend, frontend, and Playwright images directly with Podman"
 	@echo "  make restart              Restart the containers"
 	@echo "  make reset                Completely reset Podman (containers, volumes, networks)"
+	@echo "  make deploy-local         Deploy locally with development overrides"
+	@echo "  make deploy-production    Deploy with production compose file only"
 	@echo "  make backup               Create a backup of the database volume"
 	@echo "  make restore              Restore the database volume from a backup"
 	@echo "  make clean                Remove all containers and volumes"