diff --git a/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration-RM.zip b/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration-RM.zip
index 1a544b8..ed5c945 100644
Binary files a/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration-RM.zip and b/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration-RM.zip differ
diff --git a/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration-RM.zip b/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration-RM.zip
index 5ed5c9d..6d605d6 100644
Binary files a/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration-RM.zip and b/cloud-foundation/solutions-for-oracle-res-mgr/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration-RM.zip differ
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/.gitignore b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/.gitignore
index 43d7d39..0453bc9 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/.gitignore
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/.gitignore
@@ -1,4 +1,4 @@
-# Copyright © 2022, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 .terraform
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/CONTRIBUTING.md b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/CONTRIBUTING.md
index e69c06c..ca3add4 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/CONTRIBUTING.md
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 <!--
 
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/LICENSE b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/LICENSE
index e7eefb0..5a761e8 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/LICENSE
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2023 Oracle and/or its affiliates.  All rights reserved.
+Copyright © 2025 Oracle and/or its affiliates.  All rights reserved.
 
 The Universal Permissive License (UPL), Version 1.0
 
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/README.md b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/README.md
index dbf9582..fc740a6 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/README.md
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/README.md
@@ -49,6 +49,19 @@ Query and save the recommendations
 
 Oracle Cloud provides an amazing platform to productively deliver secure, insightful, scalable and performant solutions. MovieStream designed their solution leveraging the world class Oracle Autonomous Database and Oracle Cloud Infrastructure (OCI) Data Lake services. Their data architecture is following the Oracle Reference Architecture [_Enterprise Data Warehousing - an Integrated Data Lake_](https://docs.oracle.com/en/solutions/oci-curated-analysis/index.html) - which is used by Oracle customers around the world. It's worthwhile to review the architecture so you can understand the value of integrating the data lake and data warehouse - as it enables you to answer more complex questions using all your data.
 
+## Important  - please deploy the solution in one of the listed regions below as the GenAI it's only available in this regions. If you deploy it in other regions, the solution will not work. If you don't have any of the regions available in your tenancy, please subscribe to one of them.
+
+
+Some regions don't offer all the models. See the region for each pretrained model to find out which models are available in a region near you.
+
+| Region Name              | Location  | Region Identifier | Region Key |
+|--------------------------|----------|-------------------|------------|
+| Brazil East (Sao Paulo)  | Sao Paulo | sa-saopaulo-1     | GRU        |
+| Germany Central (Frankfurt) | Frankfurt | eu-frankfurt-1 | FRA        |
+| Japan Central (Osaka)    | Osaka    | ap-osaka-1       | KIX        |
+| UK South (London)        | London   | uk-london-1      | LHR        |
+| US Midwest (Chicago)     | Chicago  | us-chicago-1     | ORD        |
+
 
 ## <a name="deliverables"></a>Deliverables
 ----------------
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/locals.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/locals.tf
index ee33bd4..f1b59c4 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/locals.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/locals.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 data "oci_identity_availability_domains" "ADs" {
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/main.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/main.tf
index 29b55b3..f4f870a 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/main.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/main.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Create ADW Database with Endpoint in private subnet or public ADW
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/main.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/main.tf
index 547572e..08bb6aa 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/main.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/main.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 locals {
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/outputs.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/outputs.tf
index 05a8498..0a2286c 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/outputs.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/outputs.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "atp_db_id" {
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/variables.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/variables.tf
index e134afa..f746842 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/variables.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/modules/cloud-foundation-library/database/adb/variables.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "adw_params" {
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/outputs.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/outputs.tf
index 0e76925..6b83802 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/outputs.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/outputs.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Autonomous Database Outputs:
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provider.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provider.tf
index 3daf300..4ec1b92 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provider.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provider.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 terraform {
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provisioners.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provisioners.tf
index d42b3ba..ab6c40f 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provisioners.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/provisioners.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "null_resource" "sqlcl-create-usr" {
@@ -8,7 +8,8 @@ resource "null_resource" "sqlcl-create-usr" {
 
                 echo 'Download the apex applications'
                 chmod 777 ./scripts/
-                wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f101.sql -P ./scripts/
+                # wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f101.sql -P ./scripts/
+                wget https://github.com/oracle-devrel/oracle-autonomous-database-samples/blob/main/apex/select-ai-chat/f101.sql?raw=true -P ./scripts/
                 wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f100-genai-project.sql -P ./scripts/
 
                 # install the data
@@ -25,6 +26,9 @@ resource "null_resource" "sqlcl-create-usr" {
                 sql -cloudconfig wallet_${var.db_name}.zip moviestream/watchS0meMovies#@'${local.conn_db}' @./scripts/install-apex-app.sql
 
                 rm -rf tables.sql     
+                rm -rf ./scripts/f100-genai-project.sql
+                rm -rf ./scripts/f101.sql?raw=true
+                rm -rf ./scripts/install-apex-app.sql
             EOT
         }
 depends_on = [module.adb]
@@ -33,4 +37,9 @@ depends_on = [module.adb]
 resource "local_file" "this" {
   content  = templatefile("./scripts/tables.sql.tmpl", { tag = var.tag, run_post_load_procedures = var.run_post_load_procedures, llm_secret = var.llm_secret  })
   filename = "./tables.sql"
+}
+
+resource "local_file" "this2" {
+  content  = templatefile("./scripts/install-apex-app.sql.tmpl", { region = var.region })
+  filename = "./scripts/install-apex-app.sql"
 }
\ No newline at end of file
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/schema.yaml b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/schema.yaml
index c38180b..cdea8b5 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/schema.yaml
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/schema.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 title: "Deploy ChatDB - Autonomous Database Select AI demonstration"
@@ -91,7 +91,7 @@ variables:
     enum:
       - LICENSE_INCLUDED
       - BRING_YOUR_OWN_LICENSE
-    default: LICENSE_INCLUDED
+    default: BRING_YOUR_OWN_LICENSE
     required: true
     visible:
       eq:
@@ -109,8 +109,8 @@ variables:
     description: "A valid Oracle Database version for Autonomous Database"
     type: enum
     enum:
-      - "19c"
-    default: "19c"
+      - "23ai"
+    default: "23ai"
     required: true
     visible: true
   db_size_in_tbs:
@@ -165,7 +165,7 @@ variables:
     title: The number of ECPUs cores to be made available to the database 
     description: "The number of ECPU cores to enable. For ECPUs count needs to be minimum 2 and maximum 512 ECPUs"
     type: string
-    default: 4
+    default: 2
     required: true
     visible:
       eq:
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/init.sql b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/init.sql
index 8e77a72..a06487f 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/init.sql
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/init.sql
@@ -1,4 +1,4 @@
--- **Copyright © 2023, Oracle and/or its affiliates.
+-- **Copyright © 2025, Oracle and/or its affiliates.
 -- **All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/install-apex-app.sql b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/install-apex-app.sql.tmpl
similarity index 73%
rename from cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/install-apex-app.sql
rename to cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/install-apex-app.sql.tmpl
index 4990555..1d3994f 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/install-apex-app.sql
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/install-apex-app.sql.tmpl
@@ -21,7 +21,7 @@ BEGIN
 
 END;
 /
-@./scripts/f101.sql
+@./scripts/f101.sql?raw=true
 
 -- GenAI Projects App 
 BEGIN
@@ -38,23 +38,25 @@ END;
 /
 @./scripts/f100-genai-project.sql
 
--- Setup Select AI. Create 2 profiles. One for chat and the other for GenAI projects
+-- Setup Select AI. Create profile.
+declare
+    v_region varchar2(100) := '${region}'; -- Default region
 begin
-    admin.workshop.write('Setup ai profile for chat', 2);
+    admin.workshop.write('Setup ai profile', 2);
     
     -- Chat
     dbms_cloud_ai.drop_profile(
-        profile_name => 'openai_gpt35',
+        profile_name => 'genai',
         force => true
         );
 
     dbms_cloud_ai.create_profile(
-        profile_name => 'openai_gpt35',
+        profile_name => 'genai',
         attributes =>       
-            '{"provider": "openai",
-            "credential_name": "OPENAI_CRED",
+            '{"provider": "oci",
+            "credential_name": "OCI$RESOURCE_PRINCIPAL",
             "comments":"true",
-            "temperature":0.2,
+            "region":"' || v_region || '",
             "object_list": [
                 {"owner": "MOVIESTREAM", "name": "GENRE"},
                 {"owner": "MOVIESTREAM", "name": "CUSTOMER"},
@@ -64,23 +66,7 @@ begin
                 {"owner": "MOVIESTREAM", "name": "ACTORS"}
             ]
             }'
-        );
-
-    admin.workshop.write('Setup GenAI projects AI profile', 2);
-    
-    -- GenAI projects
-    dbms_cloud_ai.drop_profile(
-        profile_name => 'genai',
-        force => true
-        );
-
-    dbms_cloud_ai.create_profile(
-        profile_name => 'genai',
-        attributes =>       
-            '{"provider": "oci",
-            "credential_name": "OCI$RESOURCE_PRINCIPAL"
-            }'
-        );        
+        );    
         
 end;
 /
\ No newline at end of file
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/tables.sql.tmpl b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/tables.sql.tmpl
index 1fd6983..46f08a1 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/tables.sql.tmpl
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/scripts/tables.sql.tmpl
@@ -1,4 +1,4 @@
--- **Copyright © 2023, Oracle and/or its affiliates.
+-- **Copyright © 2025, Oracle and/or its affiliates.
 -- **All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
     -- Tables will be installed in the current schema
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/variables.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/variables.tf
index 17521cd..4eb8ed4 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/variables.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-Select-AI-demonstration/variables.tf
@@ -1,4 +1,4 @@
-# Copyright © 2023, Oracle and/or its affiliates.
+# Copyright © 2025, Oracle and/or its affiliates.
 # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 
@@ -13,12 +13,12 @@ variable "tenancy_ocid" {
 
 variable "region" {
     type = string
-    # default = ""
+    default = "us-chicago-1"
 }
 
 variable "compartment_id" {
   type = string
-  # default = ""
+  default = ""
 }
 
 variable "user_ocid" {
@@ -55,7 +55,7 @@ variable "db_compute_model" {
 
 variable "db_compute_count" {
   type = number
-  default = 4
+  default = 2
 }
 
 variable "db_size_in_tbs" {
@@ -70,7 +70,7 @@ variable "db_workload" {
 
 variable "db_version" {
   type = string
-  default = "19c"
+  default = "23ai"
 }
 
 variable "db_enable_auto_scaling" {
@@ -85,7 +85,7 @@ variable "db_is_free_tier" {
 
 variable "db_license_model" {
   type = string
-  default = "LICENSE_INCLUDED"
+  default = "BRING_YOUR_OWN_LICENSE"
 }
 
 variable "db_data_safe_status" {
@@ -110,7 +110,8 @@ variable "db_database_management_status" {
 
 variable "llm_secret" {
   type    = string
-  default = "null"
+  # default = "null"
+  default = ""
 }
 
 variable "tag" {
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/README.md b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/README.md
index 38d44c0..9310f2a 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/README.md
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/README.md
@@ -50,6 +50,21 @@ Query and save the recommendations
 Oracle Cloud provides an amazing platform to productively deliver secure, insightful, scalable and performant solutions. MovieStream designed their solution leveraging the world class Oracle Autonomous Database and Oracle Cloud Infrastructure (OCI) Data Lake services. Their data architecture is following the Oracle Reference Architecture [_Enterprise Data Warehousing - an Integrated Data Lake_](https://docs.oracle.com/en/solutions/oci-curated-analysis/index.html) - which is used by Oracle customers around the world. It's worthwhile to review the architecture so you can understand the value of integrating the data lake and data warehouse - as it enables you to answer more complex questions using all your data.
 
 
+## Important  - please deploy the solution in one of the listed regions below as the GenAI it's only available in this regions. If you deploy it in other regions, the solution will not work. If you don't have any of the regions available in your tenancy, please subscribe to one of them.
+
+
+Some regions don't offer all the models. See the region for each pretrained model to find out which models are available in a region near you.
+
+| Region Name              | Location  | Region Identifier | Region Key |
+|--------------------------|----------|-------------------|------------|
+| Brazil East (Sao Paulo)  | Sao Paulo | sa-saopaulo-1     | GRU        |
+| Germany Central (Frankfurt) | Frankfurt | eu-frankfurt-1 | FRA        |
+| Japan Central (Osaka)    | Osaka    | ap-osaka-1       | KIX        |
+| UK South (London)        | London   | uk-london-1      | LHR        |
+| US Midwest (Chicago)     | Chicago  | us-chicago-1     | ORD        |
+
+
+
 ## <a name="deliverables"></a>Deliverables
 ----------------
 
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/provisioners.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/provisioners.tf
index 4cb5807..72bd30d 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/provisioners.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/provisioners.tf
@@ -8,7 +8,8 @@ resource "null_resource" "sqlcl-create-usr" {
 
                 echo 'Download the apex applications'
                 chmod 777 ./scripts/
-                wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f101.sql -P ./scripts/
+                # wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f101.sql -P ./scripts/
+                wget https://github.com/oracle-devrel/oracle-autonomous-database-samples/blob/main/apex/select-ai-chat/f101.sql?raw=true -P ./scripts/
                 wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f100-genai-project.sql -P ./scripts/
 
                 # install the data
@@ -24,7 +25,9 @@ resource "null_resource" "sqlcl-create-usr" {
                 echo 'Start running install-apex-app.sql script to install the apex app'
                 sql -cloudconfig wallet_${var.db_name}.zip moviestream/watchS0meMovies#@'${local.conn_db}' @./scripts/install-apex-app.sql
 
-                rm -rf tables.sql     
+                rm -rf tables.sql
+                rm -rf ./scripts/f100-genai-project.sql
+                rm -rf ./scripts/f101.sql?raw=true
             EOT
         }
 depends_on = [module.adb]
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/schema.yaml b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/schema.yaml
index 08ee88a..a1781b3 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/schema.yaml
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/schema.yaml
@@ -90,7 +90,7 @@ variables:
     enum:
       - LICENSE_INCLUDED
       - BRING_YOUR_OWN_LICENSE
-    default: LICENSE_INCLUDED
+    default: BRING_YOUR_OWN_LICENSE
     required: true
     visible:
       eq:
@@ -108,9 +108,8 @@ variables:
     description: "A valid Oracle Database version for Autonomous Database"
     type: enum
     enum:
-      - "19c"
       - "23ai"
-    default: "19c"
+    default: "23ai"
     required: true
     visible: true
   db_size_in_tbs:
@@ -165,7 +164,7 @@ variables:
     title: The number of ECPUs cores to be made available to the database 
     description: "The number of ECPU cores to enable. For ECPUs count needs to be minimum 2 and maximum 512 ECPUs"
     type: string
-    default: 4
+    default: 2
     required: true
     visible:
       eq:
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/scripts/install-apex-app.sql b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/scripts/install-apex-app.sql
index b828912..aa30008 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/scripts/install-apex-app.sql
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/scripts/install-apex-app.sql
@@ -21,7 +21,7 @@ BEGIN
 
 END;
 /
-@./scripts/f101.sql
+@./scripts/f101.sql?raw=true
 
 -- GenAI Projects App 
 BEGIN
diff --git a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/variables.tf b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/variables.tf
index 0b7b446..4bc9d9b 100644
--- a/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/variables.tf
+++ b/cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/variables.tf
@@ -13,12 +13,12 @@ variable "tenancy_ocid" {
 
 variable "region" {
     type = string
-    # default = ""
+    default = ""
 }
 
 variable "compartment_id" {
   type = string
-  # default = ""
+  default = ""
 }
 
 variable "user_ocid" {
@@ -36,6 +36,7 @@ variable "private_key_path" {
     default = ""
 }
 
+
 # ADW Database Variables:
 
 variable "db_name" {
@@ -55,7 +56,7 @@ variable "db_compute_model" {
 
 variable "db_compute_count" {
   type = number
-  default = 4
+  default = 2
 }
 
 variable "db_size_in_tbs" {
@@ -70,7 +71,7 @@ variable "db_workload" {
 
 variable "db_version" {
   type = string
-  default = "19c"
+  default = "23ai"
 }
 
 variable "db_enable_auto_scaling" {
@@ -85,7 +86,7 @@ variable "db_is_free_tier" {
 
 variable "db_license_model" {
   type = string
-  default = "LICENSE_INCLUDED"
+  default = "BRING_YOUR_OWN_LICENSE"
 }
 
 variable "db_data_safe_status" {