From c21916559f4e77c6fd501643c63f42105cff511f Mon Sep 17 00:00:00 2001
From: root <melabidi@alrahmaisgl.org>
Date: Thu, 2 Jul 2026 18:24:19 -0400
Subject: [PATCH] chore: remove unused marketplace configuration

---
 .env.docker.dev                           |  2 --
 .env.docker.production.example            |  3 ---
 .env.docker.production.generated          |  2 --
 .env.example                              |  2 --
 docker-compose.production.yml             | 19 +++++++------------
 docs/DOCKER.md                            |  3 +--
 docs/command_to_run_dev.txt               |  5 ++---
 docs/deploy_dev.txt                       |  6 +++---
 production/.env.docker.production.example |  2 --
 production/docker-compose.production.yml  | 19 +++++++------------
 production/scripts/docker-prod-common.sh  |  9 +++++++++
 scripts/docker-prod-common.sh             |  9 +++++++++
 12 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/.env.docker.dev b/.env.docker.dev
index db96cde..a75aeeb 100644
--- a/.env.docker.dev
+++ b/.env.docker.dev
@@ -11,7 +11,6 @@ API_PORT=4000
 API_URL=http://localhost:4000
 API_INTERNAL_URL=http://api:4000/api/v1
 NEXT_PUBLIC_API_URL=http://localhost:4000/api/v1
-NEXT_PUBLIC_MARKETPLACE_URL=http://localhost:3000
 NEXT_PUBLIC_DASHBOARD_URL=http://localhost:3000/dashboard
 NEXT_PUBLIC_ADMIN_URL=http://localhost:3000/admin
 DASHBOARD_URL=http://localhost:3000/dashboard
@@ -19,7 +18,6 @@ ADMIN_URL=http://localhost:3000/admin
 DASHBOARD_INTERNAL_URL=http://host.docker.internal:3001
 ADMIN_INTERNAL_URL=http://host.docker.internal:3002
 # Asset prefix for the dashboard/admin dev servers so browsers load JS chunks from the
-# correct port rather than through the marketplace proxy (which doesn't have those chunks).
 DASHBOARD_ASSET_PREFIX=http://localhost:3001/dashboard
 ADMIN_ASSET_PREFIX=http://localhost:3002/admin
 JWT_SECRET=placeholder
diff --git a/.env.docker.production.example b/.env.docker.production.example
index b5fef70..56e0b69 100644
--- a/.env.docker.production.example
+++ b/.env.docker.production.example
@@ -35,7 +35,6 @@ REDIS_URL=redis://:PMPS5k0D7rUeJOk0NkhI5bRtoGjkUqjK@redis:6379
 API_PORT=4000
 # SSR server-side calls go via the internal Docker network
 API_INTERNAL_URL=http://api:4000/api/v1
-# Next.js rewrites between the marketplace and internal apps also use Docker-network URLs
 DASHBOARD_INTERNAL_URL=http://dashboard:3001
 ADMIN_INTERNAL_URL=http://admin:3002
 # Public-facing API URL visible to browsers — MUST be your real domain, not localhost
@@ -50,8 +49,6 @@ NEXT_PUBLIC_API_URL=https://api.rentaldrivego.ma/api/v1
 SITE_ORIGIN=https://rentaldrivego.ma
 
 # Carplace public routes sit under /carplace on the public site domain.
-NEXT_PUBLIC_MARKETING_URL=https://rentaldrivego.ma
-NEXT_PUBLIC_MARKETPLACE_URL=https://rentaldrivego.ma
 NEXT_PUBLIC_CARPLACE_URL=https://rentaldrivego.ma/carplace
 NEXT_PUBLIC_DASHBOARD_URL=https://rentaldrivego.ma/dashboard
 NEXT_PUBLIC_ADMIN_URL=https://rentaldrivego.ma/admin
diff --git a/.env.docker.production.generated b/.env.docker.production.generated
index 53b04fa..29ab420 100644
--- a/.env.docker.production.generated
+++ b/.env.docker.production.generated
@@ -30,8 +30,6 @@ API_URL=https://api.example.com
 NEXT_PUBLIC_API_URL=https://api.example.com/api/v1
 
 # Frontend public URLs
-NEXT_PUBLIC_MARKETING_URL=https://example.com
-NEXT_PUBLIC_MARKETPLACE_URL=https://example.com
 NEXT_PUBLIC_HOMEPAGE_URL=https://example.com
 NEXT_PUBLIC_STOREFRONT_URL=https://example.com
 NEXT_PUBLIC_DASHBOARD_URL=https://example.com/dashboard
diff --git a/.env.example b/.env.example
index e1c2178..bf4b682 100644
--- a/.env.example
+++ b/.env.example
@@ -86,8 +86,6 @@ REDIS_URL=redis://localhost:6379
 # SITE_ORIGIN=https://your-production-domain.example
 
 
-NEXT_PUBLIC_MARKETING_URL=http://localhost:3000
-NEXT_PUBLIC_MARKETPLACE_URL=http://localhost:3000
 NEXT_PUBLIC_DASHBOARD_URL=http://localhost:3000/dashboard
 NEXT_PUBLIC_ADMIN_URL=http://localhost:3000/admin
 NEXT_PUBLIC_STOREFRONT_URL=http://localhost:3000/storefront
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index af9080d..ad471e0 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -55,9 +55,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -88,9 +87,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -114,6 +112,7 @@ services:
     environment:
       DATABASE_URL_FROM_POSTGRES: ${DATABASE_URL_FROM_POSTGRES:-true}
       FILE_STORAGE_ROOT: /var/lib/rentaldrivego/storage
+      NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
       POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
       POSTGRES_PORT: ${POSTGRES_PORT:-5432}
       POSTGRES_DB: ${POSTGRES_DB:-rentaldrivego}
@@ -148,8 +147,7 @@ services:
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -191,9 +189,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -235,9 +232,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -279,9 +275,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
diff --git a/docs/DOCKER.md b/docs/DOCKER.md
index a90fbcd..2ea66e4 100644
--- a/docs/DOCKER.md
+++ b/docs/DOCKER.md
@@ -195,8 +195,7 @@ For production image builds, also define these GitLab CI/CD variables with their
 
 ```text
 NEXT_PUBLIC_API_URL=https://api.rentaldrivego.ma/api/v1
-NEXT_PUBLIC_MARKETPLACE_URL=https://rentaldrivego.ma
-NEXT_PUBLIC_CARPLACE_URL=https://rentaldrivego.ma
+NEXT_PUBLIC_CARPLACE_URL=https://rentaldrivego.ma/carplace
 NEXT_PUBLIC_DASHBOARD_URL=https://rentaldrivego.ma/dashboard
 NEXT_PUBLIC_ADMIN_URL=https://rentaldrivego.ma/admin
 ```
diff --git a/docs/command_to_run_dev.txt b/docs/command_to_run_dev.txt
index dd97eea..5f19848 100644
--- a/docs/command_to_run_dev.txt
+++ b/docs/command_to_run_dev.txt
@@ -1,10 +1,10 @@
 docker compose -f docker-compose.dev.yml up -d postgres
 docker compose -f docker-compose.dev.yml up -d redis
-docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps marketplace
+docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps carplace
 docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps admin
 docker compose -f docker-compose.dev.yml --profile full up --build
 docker compose -f docker-compose.dev.yml --profile dashboard up --build
-docker compose -f docker-compose.dev.yml --profile marketplace up --build
+docker compose -f docker-compose.dev.yml --profile carplace up --build
 docker compose -f docker-compose.dev.yml --profile api up --build
 
 
@@ -44,4 +44,3 @@ cp .env.docker.production.example .env.docker.production
 # Deploy
 docker compose -f traefik.yaml up -d
 docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d
-
diff --git a/docs/deploy_dev.txt b/docs/deploy_dev.txt
index d09661f..b1c7850 100644
--- a/docs/deploy_dev.txt
+++ b/docs/deploy_dev.txt
@@ -29,7 +29,7 @@ Deploy dev
   ├─────────────┼───────────────────────────────────────────────┤
   │ public-site │ http://localhost:3000                         │
   ├─────────────┼───────────────────────────────────────────────┤
-  │ marketplace │ http://localhost:3001/marketplace             │
+  │ carplace    │ http://localhost:3004/carplace                │
   ├─────────────┼───────────────────────────────────────────────┤
   │ dashboard   │ http://localhost:3002/dashboard               │
   ├─────────────┼───────────────────────────────────────────────┤
@@ -40,6 +40,6 @@ Deploy dev
   │ pgAdmin     │ http://localhost:5050 (needs --profile tools) │
   └─────────────┴───────────────────────────────────────────────┘
 
-  ▎ Note: In Docker dev each app is directly accessible on its own port. The /marketplace, /dashboard, /admin proxy 
+  ▎ Note: In Docker dev each app is directly accessible on its own port. The /carplace, /dashboard, /admin proxy 
   ▎ through port 3000 (public-site) only works when running locally (not in separate containers), since localhost inside
-  ▎  a container refers to that container only.
\ No newline at end of file
+  ▎  a container refers to that container only.
diff --git a/production/.env.docker.production.example b/production/.env.docker.production.example
index 9cf5325..ecd54f5 100644
--- a/production/.env.docker.production.example
+++ b/production/.env.docker.production.example
@@ -48,8 +48,6 @@ NEXT_PUBLIC_API_URL=https://api.rentaldrivego.ma/api/v1
 
 # Frontend public URLs
 SITE_ORIGIN=https://rentaldrivego.ma
-NEXT_PUBLIC_MARKETING_URL=https://rentaldrivego.ma
-NEXT_PUBLIC_MARKETPLACE_URL=https://rentaldrivego.ma
 NEXT_PUBLIC_HOMEPAGE_URL=https://rentaldrivego.ma
 NEXT_PUBLIC_CARPLACE_URL=https://rentaldrivego.ma/carplace
 NEXT_PUBLIC_DASHBOARD_URL=https://rentaldrivego.ma/dashboard
diff --git a/production/docker-compose.production.yml b/production/docker-compose.production.yml
index 1e28ee5..54b7175 100644
--- a/production/docker-compose.production.yml
+++ b/production/docker-compose.production.yml
@@ -55,9 +55,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -88,9 +87,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -114,6 +112,7 @@ services:
     environment:
       DATABASE_URL_FROM_POSTGRES: ${DATABASE_URL_FROM_POSTGRES:-true}
       FILE_STORAGE_ROOT: /var/lib/rentaldrivego/storage
+      NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
       POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
       POSTGRES_PORT: ${POSTGRES_PORT:-5432}
       POSTGRES_DB: ${POSTGRES_DB:-rentaldrivego}
@@ -148,8 +147,7 @@ services:
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -191,9 +189,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -235,9 +232,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
@@ -279,9 +275,8 @@ services:
         DASHBOARD_INTERNAL_URL: ${DASHBOARD_INTERNAL_URL:-http://dashboard:3001}
         ADMIN_INTERNAL_URL: ${ADMIN_INTERNAL_URL:-http://admin:3002}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        NEXT_PUBLIC_MARKETPLACE_URL: ${NEXT_PUBLIC_MARKETPLACE_URL}
         NEXT_PUBLIC_HOMEPAGE_URL: ${NEXT_PUBLIC_HOMEPAGE_URL}
-        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL}
+        NEXT_PUBLIC_CARPLACE_URL: ${NEXT_PUBLIC_CARPLACE_URL:-${SITE_ORIGIN}/carplace}
         NEXT_PUBLIC_DASHBOARD_URL: ${NEXT_PUBLIC_DASHBOARD_URL}
         NEXT_PUBLIC_ADMIN_URL: ${NEXT_PUBLIC_ADMIN_URL}
         SITE_ORIGIN: ${SITE_ORIGIN}
diff --git a/production/scripts/docker-prod-common.sh b/production/scripts/docker-prod-common.sh
index e137ca4..569badf 100755
--- a/production/scripts/docker-prod-common.sh
+++ b/production/scripts/docker-prod-common.sh
@@ -102,6 +102,15 @@ export_compose_env_from_file() {
       export "${key}=${value}"
     fi
   done < "${ENV_FILE}"
+
+  if [[ -z "${NEXT_PUBLIC_CARPLACE_URL:-}" ]]; then
+    if [[ -n "${NEXT_PUBLIC_STOREFRONT_URL:-}" ]]; then
+      NEXT_PUBLIC_CARPLACE_URL="${NEXT_PUBLIC_STOREFRONT_URL%/}/carplace"
+    elif [[ -n "${SITE_ORIGIN:-}" ]]; then
+      NEXT_PUBLIC_CARPLACE_URL="${SITE_ORIGIN%/}/carplace"
+    fi
+    export NEXT_PUBLIC_CARPLACE_URL
+  fi
 }
 
 load_prod_env_exports() {
diff --git a/scripts/docker-prod-common.sh b/scripts/docker-prod-common.sh
index 3055b38..19e46bc 100644
--- a/scripts/docker-prod-common.sh
+++ b/scripts/docker-prod-common.sh
@@ -97,6 +97,15 @@ export_compose_env_from_file() {
       export "${key}=${value}"
     fi
   done < "${ENV_FILE}"
+
+  if [[ -z "${NEXT_PUBLIC_CARPLACE_URL:-}" ]]; then
+    if [[ -n "${NEXT_PUBLIC_STOREFRONT_URL:-}" ]]; then
+      NEXT_PUBLIC_CARPLACE_URL="${NEXT_PUBLIC_STOREFRONT_URL%/}/carplace"
+    elif [[ -n "${SITE_ORIGIN:-}" ]]; then
+      NEXT_PUBLIC_CARPLACE_URL="${SITE_ORIGIN%/}/carplace"
+    fi
+    export NEXT_PUBLIC_CARPLACE_URL
+  fi
 }
 
 load_prod_env_exports() {