diff --git a/Dockerfiles/storefront.Dockerfile b/Dockerfiles/storefront.Dockerfile
index f53dee7a..ccb1dc6b 100644
--- a/Dockerfiles/storefront.Dockerfile
+++ b/Dockerfiles/storefront.Dockerfile
@@ -2,7 +2,10 @@
 FROM node:22-bookworm-slim AS build
 WORKDIR /app
 
-ENV NODE_ENV=development
+ARG EVIBES_BASE_DOMAIN
+ARG EVIBES_PROJECT_NAME
+ENV EVIBES_BASE_DOMAIN=$EVIBES_BASE_DOMAIN
+ENV EVIBES_PROJECT_NAME=$EVIBES_PROJECT_NAME
 
 COPY ./storefront/package.json ./storefront/package-lock.json ./
 RUN npm ci --include=optional
@@ -15,7 +18,6 @@ WORKDIR /app
 
 ENV HOST=0.0.0.0
 ENV PORT=3000
-ENV NODE_ENV=production
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends curl \
diff --git a/docker-compose.yml b/docker-compose.yml
index bc0e1d8c..8d46da49 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -227,12 +227,12 @@ services:
       dockerfile: ./Dockerfiles/storefront.Dockerfile
       args:
         - DEBUG=${DEBUG}
+        - EVIBES_BASE_DOMAIN=${EVIBES_BASE_DOMAIN}
+        - EVIBES_PROJECT_NAME=${EVIBES_PROJECT_NAME}
     restart: always
     env_file:
       - .env
     environment:
-      - NODE_ENV=${DEBUG:+development}
-      - NODE_ENV=${DEBUG:-production}
       - NUXT_HOST=0.0.0.0
       - NUXT_PORT=3000
       - NUXT_DEVTOOLS_ENABLED=${DEBUG}