diff --git a/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml
index fd7a76b15..eab44f6be 100644
--- a/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml
@@ -35,9 +35,6 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
-          env:
-            - name: BASE_URL_ROUTE
-              value: ""
           ports:
             - name: http
               containerPort: 80
diff --git a/docker-compose.yml b/docker-compose.yml
index f74ad11b6..008b42fd6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,6 +63,9 @@ services:
       auth_server_url: http://keycloak:8080/keycloak/
       keycloak_base: http://localhost/api
       frontend_url: http://localhost
+#      For deploy to subdirectory
+      BASE_URL_ROUTE: ${BASE_URL_ROUTE:-}
+      API_V2_STR: "/${BASE_URL_ROUTE}/api/v2"
     depends_on:
       - mongo
       - minio-nginx
@@ -71,8 +74,8 @@ services:
       - rabbitmq
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.backend.rule=PathPrefix(`/api`)"
-      - "traefik.http.routers.swagger.rule=PathPrefix(`/docs`)"
+      - "traefik.http.routers.backend.rule=PathPrefix(`${BASE_URL_ROUTE}/api`)"
+      - "traefik.http.routers.swagger.rule=PathPrefix(`${BASE_URL_ROUTE}/docs`)"
       - "traefik.http.services.backend.loadbalancer.server.port=80"
       - "traefik.http.routers.backend.priority=5"
 
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 729b6b0b8..0596c10c8 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -11,6 +11,11 @@ ARG BASE_URL_ROUTE=""
 ENV BASE_URL_ROUTE=${BASE_URL_ROUTE:-}
 RUN echo "Build time BASE_URL_ROUTE: ${BASE_URL_ROUTE}"
 
+# Add the build argument for CLOWDER_REMOTE_HOSTNAME to work with backend at a different host
+ARG CLOWDER_REMOTE_HOSTNAME=""
+ENV CLOWDER_REMOTE_HOSTNAME=${CLOWDER_REMOTE_HOSTNAME:-}
+RUN echo "Build time CLOWDER_REMOTE_HOSTNAME: ${CLOWDER_REMOTE_HOSTNAME}"
+
 # copy only package for caching purposes
 COPY ["package.json", "package-lock.json*", "./"]
 COPY tools/ /usr/src/app/tools/