diff --git a/app/core/llm_framework/openai_langchain.py b/app/core/llm_framework/openai_langchain.py
index 1bc0a46..9ad303b 100644
--- a/app/core/llm_framework/openai_langchain.py
+++ b/app/core/llm_framework/openai_langchain.py
@@ -34,7 +34,7 @@ def __init__(
         self,  # pylint: disable=super-init-not-called
         # FIXME : Ideal to be able to mock the __init__ from tests
         key: str = os.getenv("OPENAI_API_KEY", "dummy-for-test"),
-        model_name: str = "gpt-3.5-turbo",
+        model_name: str = os.getenv("OPENAI_LLM_NAME", "gpt-3.5-turbo"),
         vectordb: VectordbInterface = Chroma(),
         max_tokens_limit: int = int(
             os.getenv("OPENAI_MAX_TOKEN_LIMIT", "3052")),
diff --git a/app/core/llm_framework/openai_vanilla.py b/app/core/llm_framework/openai_vanilla.py
index 7ebf95c..07a99bb 100644
--- a/app/core/llm_framework/openai_vanilla.py
+++ b/app/core/llm_framework/openai_vanilla.py
@@ -30,7 +30,7 @@ def get_context(source_documents):
     return context
 
 
-def get_pre_prompt(context):
+def get_pre_prompt(context, response_language="English"):
     """Constructs a pre-prompt for the conversation, including the context"""
     chat_prefix = "The following is a conversation with an AI assistant for "
     chat_prefix += "Bible translators. The assistant is"
@@ -39,6 +39,7 @@ def get_pre_prompt(context):
         chat_prefix
         + "Read the paragraph below and answer the question, using only the information"
         " in the context delimited by triple backticks. "
+        f" Your response should be in the {response_language} language."
         "If the question cannot be answered based on the context alone, "
         'write "Sorry, I had trouble answering this question based on the '
         "information I found\n"
@@ -75,7 +76,7 @@ class OpenAIVanilla(LLMFrameworkInterface):  # pylint: disable=too-few-public-me
     def __init__(
         self,  # pylint: disable=super-init-not-called
         key: str = os.getenv("OPENAI_API_KEY"),
-        model_name: str = "gpt-3.5-turbo",
+        model_name: str = os.getenv("OPENAI_LLM_NAME", "gpt-3.5-turbo"),
         vectordb: VectordbInterface = None,  # What should this be by default?
     ) -> None:
         """Sets the API key and initializes library objects if any"""
@@ -90,22 +91,24 @@ def __init__(
         self.vectordb = vectordb
 
     def generate_text(
-        self, query: str, chat_history: List[Tuple[str, str]], **kwargs
+        self,
+        query: str,
+        chat_history: List[Tuple[str, str]],
+        response_language: str = "English",
+        **kwargs,
     ) -> dict:
         """Prompt completion for QA or Chat reponse, based on specific documents,
         if provided"""
         if len(kwargs) > 0:
-            log.warning(
-                "Unused arguments in VanillaOpenAI.generate_text(): ", **kwargs)
+            log.warning("Unused arguments in VanillaOpenAI.generate_text(): ", **kwargs)
 
         # Vectordb results are currently returned based on the whole chat history.
         # We'll need to figure out if this is optimal or not.
-        query_text = "\n".join(
-            [x[0] + "/n" + x[1][:50] + "\n" for x in chat_history])
+        query_text = "\n".join([x[0] + "/n" + x[1][:50] + "\n" for x in chat_history])
         query_text += "\n" + query
         source_documents = self.vectordb.get_relevant_documents(query_text)
         context = get_context(source_documents)
-        pre_prompt = get_pre_prompt(context)
+        pre_prompt = get_pre_prompt(context, response_language=response_language)
         prompt = append_query_to_prompt(pre_prompt, query, chat_history)
         print(f"{prompt=}")
 
@@ -122,5 +125,4 @@ def generate_text(
             }
 
         except Exception as exe:
-            raise OpenAIException(
-                "While generating answer: " + str(exe)) from exe
+            raise OpenAIException("While generating answer: " + str(exe)) from exe
diff --git a/app/core/translation/__init__.py b/app/core/translation/__init__.py
new file mode 100644
index 0000000..ab9d3cc
--- /dev/null
+++ b/app/core/translation/__init__.py
@@ -0,0 +1,40 @@
+"""Translating the user's input to English using AWS Translate service"""
+
+import json
+
+import boto3
+
+with open("../iso639-1.json", "r", encoding="utf-8") as f:
+    iso_639_1 = json.load(f)
+
+
+def translate_text(text: str):
+    """
+    Translates the given text to English using AWS Translate service
+    :param text: The text to translate
+    :return: The response, including the translated text
+    """
+    translate = boto3.client(service_name="translate", use_ssl=True)
+
+    # Call AWS Translate
+    response = translate.translate_text(
+        Text=text,
+        SourceLanguageCode="auto",  # Automatically detect the source language
+        TargetLanguageCode="en",  # Target language code is 'en' for English
+    )
+
+    source_language_code = response.get("SourceLanguageCode", "").split("-")[
+        0
+    ]  # Extracting ISO 639-1 code part
+    response["language"] = iso_639_1.get(source_language_code, "Unknown language")
+
+    return response
+
+
+if __name__ == "__main__":
+    # Example text to translate
+    TEST_TEXT = "Hola, mundo"
+    # Call the translate_text function
+    result = translate_text(TEST_TEXT)
+    # Print the result
+    print(result)
diff --git a/app/routers.py b/app/routers.py
index 63fe576..8ed91ef 100644
--- a/app/routers.py
+++ b/app/routers.py
@@ -24,6 +24,7 @@
 import schema
 from log_configs import log
 from core.auth.supabase import Supabase
+from core.translation import translate_text
 
 # from core.auth.supabase import (admin_auth_check_decorator,
 #     chatbot_auth_check_decorator, chatbot_get_labels_decorator)
@@ -45,8 +46,7 @@
 POSTGRES_DB_PORT = os.getenv("POSTGRES_DB_PORT", "5432")
 POSTGRES_DB_NAME = os.getenv("POSTGRES_DB_NAME", "adotbcollection")
 CHROMA_DB_PATH = os.environ.get("CHROMA_DB_PATH", "chromadb_store")
-CHROMA_DB_COLLECTION = os.environ.get(
-    "CHROMA_DB_COLLECTION", "adotbcollection")
+CHROMA_DB_COLLECTION = os.environ.get("CHROMA_DB_COLLECTION", "adotbcollection")
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
 
 UPLOAD_PATH = "./uploaded-files/"
@@ -204,8 +204,7 @@ def compose_vector_db_args(db_type, settings, embedding_config):
         elif embedding_config.embeddingType == schema.EmbeddingType.OPENAI:
             vectordb_args["embedding"] = OpenAIEmbedding()
         else:
-            raise GenericException(
-                "This embedding type is not supported (yet)!")
+            raise GenericException("This embedding type is not supported (yet)!")
 
     return vectordb_args
 
@@ -275,6 +274,7 @@ async def websocket_chat_endpoint(
                 question = chat_stack.transcription_framework.transcribe_audio(
                     received_bytes
                 )
+
                 start_human_q = schema.BotResponse(
                     sender=schema.SenderType.USER,
                     message=question,
@@ -285,23 +285,27 @@ async def websocket_chat_endpoint(
                 await websocket.send_json(start_human_q.dict())
 
             if len(question) > 0:
+                translation_response = translate_text(question)
+                english_query_text = translation_response["TranslatedText"]
+                query_language = translation_response["language"]
                 bot_response = chat_stack.llm_framework.generate_text(
-                    query=question, chat_history=chat_stack.chat_history
+                    query=english_query_text,
+                    chat_history=chat_stack.chat_history,
+                    response_language=query_language,
                 )
                 log.debug(
                     "Human: {0}\nBot:{1}\nSources:{2}\n\n".format(
                         question,
-                        bot_response['answer'],
-                        [item.metadata['source']
-                            for item in bot_response['source_documents']]
+                        bot_response["answer"],
+                        [
+                            item.metadata["source"]
+                            for item in bot_response["source_documents"]
+                        ],
                     )
                 )
 
                 chat_stack.chat_history.append(
-                    (
-                        bot_response["question"],
-                        bot_response["answer"]
-                    )
+                    (bot_response["question"], bot_response["answer"])
                 )
 
                 # Construct a response
@@ -357,8 +361,7 @@ async def upload_sentences(
     ),
     vectordb_type: schema.DatabaseType = Query(schema.DatabaseType.CHROMA),
     vectordb_config: schema.DBSelector = Depends(schema.DBSelector),
-    embedding_config: schema.EmbeddingSelector = Depends(
-        schema.EmbeddingSelector),
+    embedding_config: schema.EmbeddingSelector = Depends(schema.EmbeddingSelector),
     token: SecretStr = Query(
         None, desc="Optional access token to be used if user accounts not present"
     ),
@@ -409,8 +412,7 @@ async def upload_text_file(  # pylint: disable=too-many-arguments
     ),
     vectordb_type: schema.DatabaseType = Query(schema.DatabaseType.CHROMA),
     vectordb_config: schema.DBSelector = Depends(schema.DBSelector),
-    embedding_config: schema.EmbeddingSelector = Depends(
-        schema.EmbeddingSelector),
+    embedding_config: schema.EmbeddingSelector = Depends(schema.EmbeddingSelector),
     token: SecretStr = Query(
         None, desc="Optional access token to be used if user accounts not present"
     ),
@@ -473,15 +475,9 @@ async def upload_pdf_file(  # pylint: disable=too-many-arguments
     file_processor_type: schema.FileProcessorType = Query(
         schema.FileProcessorType.LANGCHAIN
     ),
-    vectordb_type: schema.DatabaseType = Query(
-        schema.DatabaseType.CHROMA
-    ),
-    vectordb_config: schema.DBSelector = Depends(
-        schema.DBSelector
-    ),
-    embedding_config: schema.EmbeddingSelector = Depends(
-        schema.EmbeddingSelector
-    ),
+    vectordb_type: schema.DatabaseType = Query(schema.DatabaseType.CHROMA),
+    vectordb_config: schema.DBSelector = Depends(schema.DBSelector),
+    embedding_config: schema.EmbeddingSelector = Depends(schema.EmbeddingSelector),
     token: SecretStr = Query(
         None, desc="Optional access token to be used if user accounts not present"
     ),
@@ -494,7 +490,9 @@ async def upload_pdf_file(  # pylint: disable=too-many-arguments
     """
     log.info("Access token used: %s", token)
 
-    vectordb_args = compose_vector_db_args(vectordb_type, vectordb_config, embedding_config)
+    vectordb_args = compose_vector_db_args(
+        vectordb_type, vectordb_config, embedding_config
+    )
     data_stack = DataUploadPipeline()
     data_stack.set_vectordb(vectordb_type, **vectordb_args)
 
@@ -524,6 +522,7 @@ async def upload_pdf_file(  # pylint: disable=too-many-arguments
     data_stack.vectordb.add_to_collection(docs=docs)
     return {"message": "Documents added to DB"}
 
+
 @router.post(
     "/upload/csv-file",
     response_model=schema.APIInfoResponse,
@@ -543,8 +542,7 @@ async def upload_csv_file(  # pylint: disable=too-many-arguments
     ),
     vectordb_type: schema.DatabaseType = Query(schema.DatabaseType.CHROMA),
     vectordb_config: schema.DBSelector = Depends(schema.DBSelector),
-    embedding_config: schema.EmbeddingSelector = Depends(
-        schema.EmbeddingSelector),
+    embedding_config: schema.EmbeddingSelector = Depends(schema.EmbeddingSelector),
     token: SecretStr = Query(
         None, desc="Optional access token to be used if user accounts not present"
     ),
@@ -571,10 +569,10 @@ async def upload_csv_file(  # pylint: disable=too-many-arguments
     elif col_delimiter == schema.CsvColDelimiter.TAB:
         col_delimiter = "\t"
     docs = data_stack.file_processor.process_file(
-        file_path = f"{UPLOAD_PATH}{file_obj.filename}",
-        file_type = schema.FileType.CSV,
-        col_delimiter = col_delimiter,
-        )
+        file_path=f"{UPLOAD_PATH}{file_obj.filename}",
+        file_type=schema.FileType.CSV,
+        col_delimiter=col_delimiter,
+    )
     data_stack.set_embedding(
         embedding_config.embeddingType,
         embedding_config.embeddingApiKey,
@@ -626,8 +624,7 @@ async def check_job_status(
 async def get_source_tags(
     db_type: schema.DatabaseType = schema.DatabaseType.CHROMA,
     settings: schema.DBSelector = Depends(schema.DBSelector),
-    embedding_config: schema.EmbeddingSelector = Depends(
-        schema.EmbeddingSelector),
+    embedding_config: schema.EmbeddingSelector = Depends(schema.EmbeddingSelector),
     token: SecretStr = Query(
         None, desc="Optional access token to be used if user accounts not present"
     ),
@@ -672,8 +669,7 @@ async def login(
                 + "Please confirm your email and then try to log in again.",
             ) from exe
 
-        raise PermissionException(
-            "Unauthorized access. Invalid credentials.") from exe
+        raise PermissionException("Unauthorized access. Invalid credentials.") from exe
 
     return {
         "message": "User logged in successfully",
diff --git a/app/templates/chat-demo-postgres.html b/app/templates/chat-demo-postgres.html
index 0afa2d1..ee507a7 100644
--- a/app/templates/chat-demo-postgres.html
+++ b/app/templates/chat-demo-postgres.html
@@ -64,7 +64,7 @@ <h1 class="font-bold mb-4">assistant.bible</h1></a
               onchange="changeLabel(this)"
             />
             <label for="faith-and-farming" class="ml-2"
-              >Faith and Farming</label
+              >Faith and Farming (generic workshop advice, but farming advice only applicable to Nigeria)</label
             >
           </div>
         </div>
diff --git a/iso639-1.json b/iso639-1.json
new file mode 100644
index 0000000..034fedc
--- /dev/null
+++ b/iso639-1.json
@@ -0,0 +1,25 @@
+{
+    "en": "English",
+    "fr": "French",
+    "es": "Spanish",
+    "de": "German",
+    "it": "Italian",
+    "pt": "Portuguese",
+    "ar": "Arabic",
+    "zh": "Chinese",
+    "ja": "Japanese",
+    "ko": "Korean",
+    "ru": "Russian",
+    "hi": "Hindi",
+    "bn": "Bengali",
+    "ur": "Urdu",
+    "fa": "Persian",
+    "tr": "Turkish",
+    "th": "Thai",
+    "id": "Indonesian",
+    "ms": "Malay",
+    "vi": "Vietnamese",
+    "sw": "Swahili",
+    "ha": "Hausa",
+    "yo": "Yoruba"
+}
diff --git a/recipes/basic_chat.py b/recipes/basic_chat.py
index 8d36717..911ec5b 100644
--- a/recipes/basic_chat.py
+++ b/recipes/basic_chat.py
@@ -23,7 +23,7 @@
     )
 chat_stack.set_llm_framework(schema.LLMFrameworkType.LANGCHAIN,
     api_key=os.getenv('OPENAI_API_KEY'),
-    model='gpt-3.5-turbo',
+    model=os.getenv('OPENAI_LLM_NAME', 'gpt-3.5-turbo')
     vectordb=chat_stack.vectordb)
 
 ##### Checking DB has content ##########
diff --git a/recipes/postgres_openai_chat.py b/recipes/postgres_openai_chat.py
index 1b24c19..6fb49f4 100644
--- a/recipes/postgres_openai_chat.py
+++ b/recipes/postgres_openai_chat.py
@@ -31,7 +31,7 @@
     user="test_user")
 chat_stack.set_llm_framework(schema.LLMFrameworkType.LANGCHAIN,
     api_key=os.getenv('OPENAI_API_KEY'),
-    model='gpt-3.5-turbo',
+    model=os.getenv('OPENAI_LLM_NAME', 'gpt-3.5-turbo'),
     vectordb=chat_stack.vectordb)
 chat_stack.label = RESOURCE_LABEL
 
diff --git a/requirements.txt b/requirements.txt
index 99ffbda..e906e6c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,3 +16,4 @@ pgvector==0.1.8
 supabase==1.0.3
 duckdb==0.7.1
 tiktoken==0.5.1
+boto3==1.34.46
\ No newline at end of file