diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index a418ce7ef67..a4af25bf353 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -25,4 +25,8 @@ annotations:
   ###########
   artifacthub.io/changes: |
     - "Improve HPA by allowing custom annotation, custom metrics and define the behavior spec (APIM-8186)"
-
+    - kind: fixed
+      description: 'allow users to handle properly baseUrl in portal next for multi tenant installations'
+      links:
+        - name: Github Issue
+          url: https://github.com/gravitee-io/issues/issues/10204
diff --git a/helm/templates/portal/portal-configmap.yaml b/helm/templates/portal/portal-configmap.yaml
index 58565a2e94c..052cc185812 100644
--- a/helm/templates/portal/portal-configmap.yaml
+++ b/helm/templates/portal/portal-configmap.yaml
@@ -43,4 +43,15 @@ data:
         }
       }
     }
+  config-next.json: |
+    {
+      {{- if .Values.portal.enforceEnvironmentId }}
+      "environmentId": "{{ .Values.portal.enforceEnvironmentId }}",
+      {{- end }}
+      {{- if .Values.portal.baseURL }}
+      "baseURL": "{{ .Values.portal.baseURL }}"
+      {{- else }}
+      "baseURL": "{{ .Values.api.ingress.portal.scheme }}://{{ index .Values.api.ingress.portal.hosts 0 }}{{ .Values.api.ingress.portal.path }}"
+      {{- end }}
+    }
 {{- end -}}
diff --git a/helm/templates/portal/portal-deployment.yaml b/helm/templates/portal/portal-deployment.yaml
index b4866bb2ddb..867e96ed501 100644
--- a/helm/templates/portal/portal-deployment.yaml
+++ b/helm/templates/portal/portal-deployment.yaml
@@ -161,6 +161,9 @@ spec:
             - name: config
               mountPath: /usr/share/nginx/html/assets/config.json
               subPath: config.json
+            - name: config
+              mountPath: /usr/share/nginx/html/next/browser/assets/config.json
+              subPath: config-next.json
             {{- with .Values.portal.extraVolumeMounts }}
             {{- tpl . $ | nindent 12 }}
             {{- end }}