diff --git a/.idea/misc.xml b/.idea/misc.xml
index e8182a0..8136279 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.12 (eveAI)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (eveai_dev)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (eveAI)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e9edca8..dab5cf5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/eveAI.iml" filepath="$PROJECT_DIR$/.idea/eveAI.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/TBD.iml" filepath="$PROJECT_DIR$/.idea/TBD.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.python-version b/.python-version
index af25bdb..ec2af43 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-eveai_dev
+eveai_tbd
diff --git a/common/utils/model_utils.py b/common/utils/model_utils.py
index 9470685..320dd99 100644
--- a/common/utils/model_utils.py
+++ b/common/utils/model_utils.py
@@ -1,3 +1,5 @@
+import os
+
 import langcodes
 from flask import current_app
 from langchain_openai import OpenAIEmbeddings, ChatOpenAI
@@ -89,10 +91,12 @@ def select_model_variables(tenant):
     model_variables['min_chunk_size'] = tenant.min_chunk_size
     model_variables['max_chunk_size'] = tenant.max_chunk_size
 
+    environment = os.getenv('FLASK_ENV', 'development')
+    portkey_metadata = {'tenant_id': str(tenant.id), 'environment': environment}
+
     # Set Embedding variables
     match embedding_provider:
         case 'openai':
-            portkey_metadata = {'tenant_id': str(tenant.id)}
             portkey_headers = createHeaders(api_key=current_app.config.get('PORTKEY_API_KEY'),
                                             provider='openai',
                                             metadata=portkey_metadata)
@@ -123,7 +127,6 @@ def select_model_variables(tenant):
     # Set Chat model variables
     match llm_provider:
         case 'openai':
-            portkey_metadata = {'tenant_id': str(tenant.id)}
             portkey_headers = createHeaders(api_key=current_app.config.get('PORTKEY_API_KEY'),
                                             metadata=portkey_metadata,
                                             provider='openai')