diff --git a/Tiltfile b/Tiltfile
index a5e62be..229eb45 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -339,11 +339,22 @@ def has_confluence_config():
     return True
 
 if has_confluence_config():
+    token = os.environ["CONFLUENCE_TOKEN"].replace(",", "\\,")
+    url = os.environ["CONFLUENCE_URL"].replace(",", "\\,")
+    space_key = os.environ["CONFLUENCE_SPACE_KEY"].replace(",", "\\,")
+
     confluence_settings = [
-        "adminBackend.secrets.confluenceLoader.token=%s" % os.environ["CONFLUENCE_TOKEN"],
-        "adminBackend.envs.confluenceLoader.CONFLUENCE_URL=%s" % os.environ["CONFLUENCE_URL"],
-        "adminBackend.envs.confluenceLoader.CONFLUENCE_SPACE_KEY=%s" % os.environ["CONFLUENCE_SPACE_KEY"],
+        "adminBackend.secrets.confluenceLoader.token=%s" % token,
+        "adminBackend.envs.confluenceLoader.CONFLUENCE_URL=%s" % url,
+        "adminBackend.envs.confluenceLoader.CONFLUENCE_SPACE_KEY=%s" % space_key,
     ]
+
+    if os.environ.get("CONFLUENCE_VERIFY_SSL"):
+        verify_ssl = os.environ["CONFLUENCE_VERIFY_SSL"].replace(",", "\\,")
+        confluence_settings.append("adminBackend.envs.confluenceLoader.CONFLUENCE_VERIFY_SSL=%s" % verify_ssl)
+    if os.environ.get("CONFLUENCE_DOCUMENT_NAME"):
+        document_names = os.environ["CONFLUENCE_DOCUMENT_NAME"].replace(",", "\\,")
+        confluence_settings.append("adminBackend.envs.confluenceLoader.CONFLUENCE_DOCUMENT_NAME=%s" % document_names)
     value_override.extend(confluence_settings)
 
 if os.environ.get("STACKIT_VLLM_API_KEY", False):
diff --git a/rag-core-library b/rag-core-library
index 5c16ffe..5f3884d 160000
--- a/rag-core-library
+++ b/rag-core-library
@@ -1 +1 @@
-Subproject commit 5c16ffe9caca6787b5e94a09a0aec9b902aba735
+Subproject commit 5f3884dc63e19ee7e15ce1f72e45f6d98ceb5e49
diff --git a/rag-infrastructure b/rag-infrastructure
index c4d81eb..e01bf89 160000
--- a/rag-infrastructure
+++ b/rag-infrastructure
@@ -1 +1 @@
-Subproject commit c4d81eb9f7ffe084afacc7dca408d4fc196fafe2
+Subproject commit e01bf8974baca6735374222b68ca7b67d02f3f68