diff --git a/config/llama_stack_client_config.yaml b/config/llama_stack_client_config.yaml
index e39413b..ec37304 100644
--- a/config/llama_stack_client_config.yaml
+++ b/config/llama_stack_client_config.yaml
@@ -89,21 +89,6 @@ inference_store:
   user: ${env.POSTGRES_USER:=assisted-chat}
   password: ${env.POSTGRES_PASSWORD:=assisted-chat}
 models:
-- metadata: {}
-  model_id: gemini/gemini-2.0-flash
-  provider_id: gemini
-  provider_model_id: gemini/gemini-2.0-flash
-  model_type: llm
-- metadata: {}
-  model_id: gemini/gemini-2.5-pro
-  provider_id: gemini
-  provider_model_id: gemini/gemini-2.5-pro
-  model_type: llm
-- metadata: {}
-  model_id: gemini/gemini-2.5-flash
-  provider_id: gemini
-  provider_model_id: gemini/gemini-2.5-flash
-  model_type: llm
 - metadata:
     embedding_dimension: 768
   model_id: sentence-transformers/all-mpnet-base-v2
diff --git a/template.yaml b/template.yaml
index 6db163e..fbc9ca4 100644
--- a/template.yaml
+++ b/template.yaml
@@ -285,8 +285,9 @@ objects:
       1.  **Start Installation / Cluster Creation:**
           * If the user expresses an interest in installing OpenShift, suggest **creating a new cluster**.
           * Prompt for necessary details like **cluster name**, **OpenShift version**, **base domain**, and whether it's a **single-node cluster**. These things must be specified before the cluster is created.
-          * Before offering the Discovery ISO, if there is no static network configuration present in the cluster, let the user know that the cluster will use DHCP for host networking config by default but if they want to configure static network config for each host, they should do it before downloading the Discovery ISO. If the user has static networking config present, do not remind them. Always check if static networking config is already present.
           * Upon successful cluster creation, inform the user and provide the **cluster ID**.
+          * Before offering the Discovery ISO, if there is no static network configuration present in the cluster, let the user know that the cluster will use DHCP for host networking config by default but if they want to configure static network config for each host, they should do it before downloading the Discovery ISO. If the user has static networking config present, do not remind them. Always check if static networking config is already present.
+          **Conditional SSH Key Prompt:** After informing the user of successful creation and providing the cluster ID, **if the user has NOT yet provided a Secure Shell (SSH) public key to be added to the cluster,** you must ask: "Do you want to add a Secure Shell (SSH) key to the cluster? If so, please provide the SSH public key." If the key was provided during the cluster creation request, do not ask this question.
 
           **Static Network Configuration**
           * If the user wants static network configuration, you should first remind them of any existing static network configuration already present on the cluster by using the appropriate tool call. Show them the YAML only and not the mac_interface_map.
diff --git a/test/evals/eval_data.yaml b/test/evals/eval_data.yaml
index dc0dff6..6fff2fa 100644
--- a/test/evals/eval_data.yaml
+++ b/test/evals/eval_data.yaml
@@ -128,7 +128,7 @@
       eval_query: Create a multi-node cluster named 'eval-test-multinode-uniq-cluster-name' with OpenShift 4.18.22 and domain test.local and with the x86_64 CPU architecture.
       eval_verify_script: ../scripts/verify_create_eval_test_multinode.sh
       expected_keywords: ["eval-test-multinode-uniq-cluster-name", "ID", "Discovery ISO", "cluster"]
-      expected_response: I have created a cluster with name eval-test-multinode-uniq-cluster-name. Before downloading the Discovery ISO, would you like to configure static network configuration for the hosts? If not, the cluster will use Dynamic Host Configuration Protocol (DHCP) for host networking configuration by default.
+      expected_response: I have created a cluster with name eval-test-multinode-uniq-cluster-name. Before downloading the Discovery ISO, would you like to configure static network configuration for the hosts? If not, the cluster will use Dynamic Host Configuration Protocol (DHCP) for host networking configuration by default. Do you want to add a Secure Shell (SSH) key to the cluster? If so, please provide the SSH public key.
     - eval_id: set_ssh_key_eval_test_ssh
       eval_query: Set the SSH key for the cluster you just created to "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCmeaBFhSJ/MLECmqUaKweRgo10ABpwdvJ7v76qLYfP0pzfzYsF3hGP/fH5OQfHi9pTbWynjaEcPHVfaTaFWHvyMtv8PEMUIDgQPWlBSYzb+3AgQ5AsChhzTJCYnRdmCdzENlV+azgtb3mVfXiyCfjxhyy3QAV4hRrMaVtJGuUQfQ== example@example.com"
       eval_types: [tool_eval, response_eval:accuracy]