diff --git a/learn2rag/ui/templates/compose/pipelines/pipeline.yml b/learn2rag/ui/templates/compose/pipelines/pipeline.yml
index 044fd1f..4899b7c 100644
--- a/learn2rag/ui/templates/compose/pipelines/pipeline.yml
+++ b/learn2rag/ui/templates/compose/pipelines/pipeline.yml
@@ -112,8 +112,7 @@ services:
       USER_PERMISSIONS_FEATURES_CODE_INTERPRETER: 'False'
       USER_PERMISSIONS_FEATURES_IMAGE_GENERATION: 'False'
       USER_PERMISSIONS_FEATURES_WEB_SEARCH: 'False'
-      #!!! {% if False and config.get("SIMPLE_AUTH") %}
-      # TODO: Upgrade openwebui and use this (WEBUI_ADMIN_EMAIL etc)
+      #!!! {% if config.get("SIMPLE_AUTH") %}
       ENABLE_SIGNUP: 'False'
       WEBUI_AUTH: 'True'
       WEBUI_ADMIN_EMAIL: '{{config["SIMPLE_AUTH"].get("username", "")}}'
@@ -123,10 +122,8 @@ services:
       # https://docs.openwebui.com/getting-started/env-configuration/#webui_auth
       # "turning off authentication is only possible for fresh installations without any existing users"
       ENABLE_SIGNUP: 'True'
-      #!!! {% if not config.get("SIMPLE_AUTH") %}
       WEBUI_AUTH: 'False'
       #!!! {% endif %}
-      #!!! {% endif %}
       WEBUI_NAME: 'Learn2RAG'
       #!!! {% if config.get("TLS") %}
       UVICORN_SSL_CERTFILE: '{{ config["TLS"]["CERTFILE"] }}'
@@ -135,17 +132,6 @@ services:
     healthcheck:
       # TODO: We only support ['CMD', 'curl', '-f', ...]
       test: ['CMD', 'curl', '-f', '{{learn2rag_scheme}}://localhost:{{ports.ui}}/health']
-  # # Only needed if WEBUI_AUTH is True for open-webui
-  #!!! {% if config.get("SIMPLE_AUTH") %}
-  # TODO: Upgrade openwebui and remove this completely
-  open-webui-setup:
-    working_dir: '{{storage_path}}'
-    command: ['bash', '-eu', '{{learn2rag_path}}/services/setup-open-webui']
-    environment:
-      WEBUI_URL: '{{learn2rag_scheme}}://{{learn2rag_hostname}}:{{ports.ui}}/'
-      ADMIN_USER_EMAIL: '{{config["SIMPLE_AUTH"].get("username", "")}}'
-      ADMIN_USER_PASSWORD: '{{config["SIMPLE_AUTH"].get("password", "")}}'
-  #!!! {% endif %}
   qdrant:
     working_dir: '{{storage_path}}'
     command:
diff --git a/services/install-open-webui b/services/install-open-webui
index 87a0be3..d4fefdc 100644
--- a/services/install-open-webui
+++ b/services/install-open-webui
@@ -2,5 +2,5 @@
 set -eux
 npm install
 npm run build
-uv venv .venv --python 3.11 --seed
+uv venv .venv --clear --python 3.11 --seed
 uv run .venv/bin/pip install .
diff --git a/services/open-webui b/services/open-webui
index a83379f..3af15d8 160000
--- a/services/open-webui
+++ b/services/open-webui
@@ -1 +1 @@
-Subproject commit a83379f3f01c5d3d64dd8acc60aa4caafc54b2ca
+Subproject commit 3af15d82aaa0089bb4f628ee1edac7ec6f684d1a
diff --git a/services/setup-open-webui b/services/setup-open-webui
deleted file mode 100644
index f735376..0000000
--- a/services/setup-open-webui
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "Waiting for webui to start..."
-while ! curl -s ${WEBUI_URL}health > /dev/null; do
-  sleep 1
-done
-
-echo "Creating admin user..."
-curl \
-  -X POST "${WEBUI_URL}api/v1/auths/signup" \
-  -H "Accept: application/json" \
-  -H "Content-Type: application/json" \
-  -d "{ \"email\": \"${ADMIN_USER_EMAIL}\", \"password\": \"${ADMIN_USER_PASSWORD}\", \"name\": \"Admin\" }"
-echo
-echo "Done setting up open-webui"
-while :; do sleep 86400; done