diff --git a/charts/hypo/templates/portal/deployment.yaml b/charts/hypo/templates/portal/deployment.yaml
index f536cfe629390b270df50d1d7c576c880aabe47f..1d75f2bbd9b36db59ccec2e785dd49c55c086c6c 100644
--- a/charts/hypo/templates/portal/deployment.yaml
+++ b/charts/hypo/templates/portal/deployment.yaml
@@ -112,15 +112,19 @@ spec:
             - name: DOMAINS_URL
               value: "http://{{ include "hypo.fabric-api.fullname" . }}.{{ .Release.Namespace  }}.svc.cluster.local:{{ include "hypo.fabric.port" . }}/fabric-api/domain/identities"
             - name: NEXT_PUBLIC_GRAFANA_URL
-              {{- if eq .Values.installation "dev" }}
+              {{- if and (eq .Values.installation "dev") $kubePrometheusStack.grafana.ingress.setup }}
               value: "http://$(NODE_IP):{{ $ingressNginx.controller.service.nodePorts.http }}/grafana/login"
+              {{ else if and (eq .Values.installation "dev") (not $kubePrometheusStack.grafana.ingress.setup) }}
+              value: "http://{{ template "hypo.grafana.url" . }}:{{ $kubePrometheusStack.grafana.service.nodePort }}/login"
               {{ else }}
               value: "{{ $kubePrometheusStack.grafana.env.GF_SERVER_ROOT_URL }}/login"
               {{- end }}
             - name: AUTH_URL
-              {{- if eq .Values.installation "dev" }}
+              {{- if and (eq .Values.installation "dev") .Values.portal.ingress.enabled }}
               value: "http://$(NODE_IP):{{ $ingressNginx.controller.service.nodePorts.http }}"
-              {{ else }}
+              {{ else if and (eq .Values.installation "dev") (not .Values.portal.ingress.enabled) }}
+              value: "http://$(NODE_IP):{{ .Values.portal.service.nodePort }}"
+              {{ else if eq .Values.installation "prod" }}
               value: {{ .Values.portal.domain }}
               {{- end }}
           resources: