diff --git a/manifests/dot-ai-stack/values.yaml b/manifests/dot-ai-stack/values.yaml
index 8d63a98..bd3cceb 100644
--- a/manifests/dot-ai-stack/values.yaml
+++ b/manifests/dot-ai-stack/values.yaml
@@ -13,10 +13,8 @@ dot-ai:
     name: dot-ai-model-api-key
     auth:
       keyName: auth-token
-      token: ""
     openai:
       keyName: model-api-key
-      apiKey: ""
 
   ingress:
     enabled: true
@@ -36,8 +34,16 @@ dot-ai-ui:
   enabled: true
   fullnameOverride: dot-ai-ui
 
+  dotAi:
+    auth:
+      secretRef:
+        name: dot-ai-model-api-key
+        key: auth-token
+
   uiAuth:
-    token: "+zjZEF8v9l9zG3evXgTuF9RIdMtpfOXr6u6o4+bXl5Y="
+    secretRef:
+      name: dot-ai-model-api-key
+      key: ui-auth-token
 
   ingress:
     enabled: true
diff --git a/manifests/secrets-ai-stack/values.yaml b/manifests/secrets-ai-stack/values.yaml
index fa65589..7c30de6 100644
--- a/manifests/secrets-ai-stack/values.yaml
+++ b/manifests/secrets-ai-stack/values.yaml
@@ -12,4 +12,7 @@ externalSecrets:
         property: model-api-key
       - secretKey: auth-token
         remoteKey: ai-stack/dot-ai
-        property: auth-token
\ No newline at end of file
+        property: auth-token
+      - secretKey: ui-auth-token
+        remoteKey: ai-stack/dot-ai
+        property: ui-auth-token
\ No newline at end of file