diff --git a/config.yml b/config.yml
index 08a8b2a..7440579 100644
--- a/config.yml
+++ b/config.yml
@@ -2,6 +2,13 @@ recipe: default.v1
 language: en
 pipeline:
 - name: LLMBasedRouter
+  llm:
+    model_name: "gpt-35-turbo"
+    engine: "test-gpt-35-turbo"
+    api_type: "azure"
+    api_version: "2024-02-01"
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+    request_timeout: 14
   calm_entry:
     sticky: "handles everything else, including finance and pizza orders"
   nlu_entry:
@@ -26,12 +33,21 @@ pipeline:
   timezone: "Europe/Berlin"
   timeout: 3
 - name: NLUCommandAdapter
-- name: LLMCommandGenerator
+- name: MultiStepLLMCommandGenerator
+  flow_retrieval:
+    embeddings:
+      model: text-embedding-3-small
+      deployment: test-text-embedding-3-small
+      openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+      openai_api_type: azure
+      openai_api_version: "2024-02-01"
   llm:
-    model_name: gpt-4
+    model_name: "gpt-35-turbo"
+    engine: "test-gpt-35-turbo"
+    api_type: "azure"
+    api_version: "2024-02-01"
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
     request_timeout: 7
-    temperature: 0.0
-    top_p: 0.0
 
 policies:
 - name: RulePolicy
@@ -41,15 +57,34 @@ policies:
 - name: EnterpriseSearchPolicy
   #use_generative_llm: false
   #prompt: rag.jinja2
-  vector_store:
-    type: "addons.qdrant.Qdrant_Store"
+#  vector_store:
+#    type: "addons.qdrant.Qdrant_Store"
   embeddings:
-    type: "huggingface"
-    model_name: "BAAI/bge-small-en-v1.5"
-    model_kwargs:
-      device: 'cpu'
-    encode_kwargs:
-      normalize_embeddings: True
+    model: text-embedding-3-small
+    deployment: test-text-embedding-3-small
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+    openai_api_type: azure
+    openai_api_version: "2024-02-01"
+  llm:
+    model_name: "gpt-35-turbo"
+    engine: "test-gpt-35-turbo"
+    api_type: "azure"
+    api_version: "2024-02-01"
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+    request_timeout: 14
 - name: IntentlessPolicy
+  embeddings:
+    model: text-embedding-3-small
+    deployment: test-text-embedding-3-small
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+    openai_api_type: azure
+    openai_api_version: "2024-02-01"
+  llm:
+    model_name: "gpt-35-turbo"
+    engine: "test-gpt-35-turbo"
+    api_type: "azure"
+    api_version: "2024-02-01"
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+    request_timeout: 14
 
 assistant_id: 20240418-073244-narrow-archive
diff --git a/endpoints.yml b/endpoints.yml
index d97a24f..8cc5cdf 100644
--- a/endpoints.yml
+++ b/endpoints.yml
@@ -57,6 +57,13 @@ action_endpoint:
 #
 nlg:
   type: rephrase
+  llm:
+    model_name: "gpt-35-turbo"
+    engine: "test-gpt-35-turbo"
+    api_type: "azure"
+    api_version: "2024-02-01"
+    openai_api_base: "https://devtribe-testing-canada-east.openai.azure.com/"
+    request_timeout: 14
 
 #tracing:
 #  type: jaeger