diff --git a/HarborForge.Frontend.Test b/HarborForge.Frontend.Test
index db9fadd..3b9533a 160000
--- a/HarborForge.Frontend.Test
+++ b/HarborForge.Frontend.Test
@@ -1 +1 @@
-Subproject commit db9fadd13d1b1fee03d2c5a46967235d439d0ef0
+Subproject commit 3b9533a43266b853ac64a79171a9f322bb39bfa8
diff --git a/docker-compose-frontend-expose.yml b/docker-compose-frontend-expose.yml
index a0865a3..d10c710 100644
--- a/docker-compose-frontend-expose.yml
+++ b/docker-compose-frontend-expose.yml
@@ -34,7 +34,8 @@ services:
       CONFIG_DIR: /config
       LISTEN_ADDR: "0.0.0.0:${WIZARD_PORT:-8080}"
       MAX_BACKUPS: "5"
-      CORS_ORIGINS: http://127.0.0.1:${FRONTEND_PORT:-3000},http://localhost:${FRONTEND_PORT:-3000}
+      # Allow frontend (container network) and localhost for testing
+      CORS_ORIGINS: http://frontend:${FRONTEND_PORT:-3000},http://127.0.0.1:${FRONTEND_PORT:-3000},http://localhost:${FRONTEND_PORT:-3000}
     ports:
       - "127.0.0.1:${WIZARD_PORT:-8080}:${WIZARD_PORT:-8080}"
     networks:
@@ -74,7 +75,8 @@ services:
     container_name: harborforge-test-frontend
     restart: "no"
     environment:
-      VITE_API_BASE_URL: http://127.0.0.1:${BACKEND_PORT:-8000}
+      # Use internal service name for backend API
+      VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
     ports:
       - "127.0.0.1:${FRONTEND_PORT:-3000}:${FRONTEND_PORT:-3000}"
     depends_on:
diff --git a/docker-compose-frontend.yml b/docker-compose-frontend.yml
index 661ad37..7491128 100644
--- a/docker-compose-frontend.yml
+++ b/docker-compose-frontend.yml
@@ -32,6 +32,7 @@ services:
       CONFIG_DIR: /config
       LISTEN_ADDR: "0.0.0.0:${WIZARD_PORT:-8080}"
       MAX_BACKUPS: "5"
+      # Internal network only
       CORS_ORIGINS: http://frontend:${FRONTEND_PORT:-3000}
     ports:
       - "127.0.0.1:${WIZARD_PORT:-8080}:${WIZARD_PORT:-8080}"
@@ -67,6 +68,7 @@ services:
     container_name: harborforge-test-frontend
     restart: "no"
     environment:
+      # Use internal service name
       VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
     networks:
       - test-network