diff --git a/infra/main.bicep b/infra/main.bicep
index 8ee54772..bf96fe12 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -18,6 +18,8 @@ param enableTelemetry bool = true
 
 param existingLogAnalyticsWorkspaceId string = ''
 
+param azureopenaiVersion string = '2025-01-01-preview'
+
 // Restricting deployment to only supported Azure OpenAI regions validated with GPT-4o model
 @metadata({
   azd : {
@@ -1000,7 +1002,7 @@ module containerApp 'br/public:avm/res/app/container-app:0.14.2' = if (container
           }
           {
             name: 'AZURE_OPENAI_API_VERSION'
-            value: '2025-01-01-preview' //TODO: set parameter/variable
+            value: azureopenaiVersion
           }
           {
             name: 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY'
@@ -1718,3 +1720,21 @@ type webSiteConfigurationType = {
   @description('Optional. The tag of the container image to be used by the Web Site.')
   containerImageTag: string?
 }
+
+
+output COSMOSDB_ENDPOINT string = 'https://${cosmosDbResourceName}.documents.azure.com:443/'
+output COSMOSDB_DATABASE string = cosmosDbDatabaseName
+output COSMOSDB_CONTAINER string = cosmosDbDatabaseMemoryContainerName
+output AZURE_OPENAI_ENDPOINT string = 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/'
+output AZURE_OPENAI_MODEL_NAME string = aiFoundryAiServicesModelDeployment.name
+output AZURE_OPENAI_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
+output AZURE_OPENAI_API_VERSION string = azureopenaiVersion
+// output APPLICATIONINSIGHTS_INSTRUMENTATION_KEY string = applicationInsights.outputs.instrumentationKey
+// output AZURE_AI_PROJECT_ENDPOINT string = aiFoundryAiServices.outputs.aiProjectInfo.apiEndpoint
+output AZURE_AI_SUBSCRIPTION_ID string = subscription().subscriptionId
+output AZURE_AI_RESOURCE_GROUP string = resourceGroup().name
+output AZURE_AI_PROJECT_NAME string = aiFoundryAiProjectName
+output AZURE_AI_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
+// output APPLICATIONINSIGHTS_CONNECTION_STRING string = applicationInsights.outputs.connectionString
+output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
+output AZURE_AI_AGENT_ENDPOINT string = aiFoundryAiServices.outputs.aiProjectInfo.apiEndpoint