diff --git a/docker-compose.yaml b/docker-compose.yaml
index e9cc021..5b7310c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -55,26 +55,34 @@ services:
       - shared_net
     environment:
 
-      #General
+      # General
+      WEBUI_URL: https://ai.hackedyour.info
+      ADMIN_EMAIL: adamoutler@gmail.com
       ENABLE_CHANNELS: True
       USE_CUDA_DOCKER: True
       ENABLE_REALTIME_CHAT_SAVE: False
-      CONTENT_EXTRACTION_ENGINE: tika
-      TIKA_SERVER_URL: http://tika:9998
       ENV: dev
-      ADMIN_EMAIL: adamoutler@gmail.com
 
-      #RAG
+      # Ollama
+      OLLAMA_BASE_URL: http://ollama1:11434
+      OLLAMA_BASE_URLS: http://ollama1:11434,http://ollama2:11434
+
+      # OpenAI
+      OPENAI_API_KEY: ${OPEN_AI_TOKEN}
+
+      # RAG
       RAG_TEXT_SPLITTER: character 
       CHUNK_SIZE: 1000
       CHUNK_OVERLAP: 100
-      OAUTH_USERNAME_CLAIM: name
-      OAUTH_MERGE_ACCOUNTS_BY_EMAIL: true
       VECTOR_DB: chroma
       CHROMA_HTTP_HOST: chromadb
       CHROMA_HTTP_PORT: 8000
       ENABLE_RAG_LOCAL_WEB_FETCH: True
       
+      # TIKA
+      CONTENT_EXTRACTION_ENGINE: tika
+      TIKA_SERVER_URL: http://tika:9998
+
       # LDAP
       ENABLE_LOGIN_FORM: true
       ENABLE_SIGNUP: false
@@ -93,14 +101,12 @@ services:
       # OAUTH
       ENABLE_OAUTH_SIGNUP: false
       OAUTH_PROVIDER_NAME: git.adamoutler.com permissions
-      WEBUI_URL: https://ai.hackedyour.info
       OPENID_PROVIDER_URL: https://git.adamoutler.com/.well-known/openid-configuration
       OPENID_REDIRECT_URI: https://ai.hackedyour.info/oauth/oidc/callback
-      OLLAMA_BASE_URL: http://ollama1:11434
-      OLLAMA_BASE_URLS: http://ollama1:11434,http://ollama2:11434
-      OPENAI_API_KEY: ${OPEN_AI_TOKEN}
       OAUTH_CLIENT_ID: ${CLIENT_ID}
       OAUTH_CLIENT_SECRET: ${CLIENT_SECRET}
+      OAUTH_USERNAME_CLAIM: name
+      OAUTH_MERGE_ACCOUNTS_BY_EMAIL: true
 
 
   tika: