diff --git a/charts/open-webui/templates/workload-manager.yaml b/charts/open-webui/templates/workload-manager.yaml
index 0b6cc25..937597c 100644
--- a/charts/open-webui/templates/workload-manager.yaml
+++ b/charts/open-webui/templates/workload-manager.yaml
@@ -113,19 +113,30 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
         env:
-        {{- if or .Values.ollamaUrls .Values.ollama.enabled }}
+        {{- if .Values.ollamaUrlsFromExtraEnv}}
+        {{- else if or .Values.ollamaUrls .Values.ollama.enabled }}
         - name: "OLLAMA_BASE_URLS"
           value: {{ include "ollamaBaseUrls" . | quote }}
         {{- else }}
         - name: "ENABLE_OLLAMA_API"
           value: "False"
         {{- end }}
-        {{- if .Values.pipelines.enabled }}
-        - name: "OPENAI_API_BASE_URL"
-          value: {{ include "pipelines.serviceEndpoint" . }}
-        {{- else if .Values.openaiBaseApiUrl }}
+        {{- if .Values.openaiBaseApiUrl }}
+        # If only an OpenAI API value is set, set it to OPENAI_API_BASE_URL
         - name: "OPENAI_API_BASE_URL"
           value: {{ .Values.openaiBaseApiUrl | quote }}
+        {{- else if and (not .Values.openaiBaseApiUrls) .Values.pipelines.enabled }}
+        # If Pipelines is enabled and no OpenAI API value is set, set OPENAI_API_BASE_URL to the Pipelines server endpoint 
+        - name: "OPENAI_API_BASE_URL"
+          value: {{ include "pipelines.serviceEndpoint" . | quote }}
+        {{- else if and .Values.openaiBaseApiUrls .Values.pipelines.enabled }}
+        # If OpenAI API value(s) set and Pipelines is enabled, use OPENAI_API_BASE_URLS to support all the endpoints in the chart
+        - name: "OPENAI_API_BASE_URLS"
+          value: {{ toJson .Values.openaiBaseApiUrls | quote }}
+        {{- else if and (not .Values.pipelines.enabled) (kindIs "slice" .Values.openaiBaseApiUrls) (gt (len .Values.openaiBaseApiUrls) 1) }}
+        # If Pipelines is disabled and multiple OpenAI API URLs are set, use OPENAI_API_BASE_URLS
+        - name: "OPENAI_API_BASE_URLS"
+          value: {{ toJson .Values.openaiBaseApiUrls | quote }}
         {{- end }}
         {{- if .Values.extraEnvVars }}
           {{- toYaml .Values.extraEnvVars | nindent 8 }}
diff --git a/charts/open-webui/values.yaml b/charts/open-webui/values.yaml
index 77bc2e6..e65f01a 100644
--- a/charts/open-webui/values.yaml
+++ b/charts/open-webui/values.yaml
@@ -32,6 +32,9 @@ tika:
 # -- A list of Ollama API endpoints. These can be added in lieu of automatically installing the Ollama Helm chart, or in addition to it.
 ollamaUrls: []
 
+# -- Disables taking Ollama Urls from `ollamaUrls`  list
+ollamaUrlsFromExtraEnv: false
+
 websocket:
   # -- Enables websocket support in Open WebUI with env `ENABLE_WEBSOCKET_SUPPORT`
   enabled: false