diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index a4dba6e..6415a5d 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -99,7 +99,7 @@ services:
     build:
       context: ./frontend
       args:
-        - VITE_API_URL=https://mail.furyhawk.lol
+        - VITE_API_URL=https://service.furyhawk.lol
         - NODE_ENV=development
 
   playwright:
@@ -110,7 +110,7 @@ services:
       context: ./frontend
       dockerfile: Dockerfile.playwright
       args:
-        - VITE_API_URL=https://mail.furyhawk.lol
+        - VITE_API_URL=https://service.furyhawk.lol
         - NODE_ENV=production
     ipc: host
     depends_on:
@@ -120,7 +120,7 @@ services:
       - .env
     environment:
       - VITE_API_URL=https://service.furyhawk.lol
-      - MAILCATCHER_HOST=https://mail.furyhawk.lol
+      - MAILCATCHER_HOST=https://email.furyhawk.lol
       # For the reports when run locally
       - PLAYWRIGHT_HTML_HOST=0.0.0.0
       - CI=${CI}
diff --git a/frontend/.env b/frontend/.env
index afbfbe4..90670fc 100644
--- a/frontend/.env
+++ b/frontend/.env
@@ -1,2 +1,2 @@
 VITE_API_URL=https://service.furyhawk.lol
-MAILCATCHER_HOST=https://mail.furyhawk.lol
\ No newline at end of file
+MAILCATCHER_HOST=https://email.furyhawk.lol
\ No newline at end of file
diff --git a/makefile b/makefile
index d0e9353..06f3cf1 100644
--- a/makefile
+++ b/makefile
@@ -11,9 +11,9 @@ IMAGE_TAG=$(if $(TAG),$(TAG),latest)
 BACKEND_IMAGE?=$(DOCKER_IMAGE_BACKEND):$(IMAGE_TAG)
 FRONTEND_IMAGE?=$(DOCKER_IMAGE_FRONTEND):$(IMAGE_TAG)
 PLAYWRIGHT_IMAGE?=docker.io/furyhawk/home_stack_playwright:latest
-FRONTEND_BUILD_VITE_API_URL?=https://mail.furyhawk.lol
+FRONTEND_BUILD_VITE_API_URL?=https://service.furyhawk.lol
 FRONTEND_BUILD_NODE_ENV?=development
-PLAYWRIGHT_BUILD_VITE_API_URL?=https://mail.furyhawk.lol
+PLAYWRIGHT_BUILD_VITE_API_URL?=https://service.furyhawk.lol
 PLAYWRIGHT_BUILD_NODE_ENV?=production
 
 # Load environment variables from .env