diff --git a/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-adb-sample/src/main/resources/application.properties b/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-adb-sample/src/main/resources/application.properties
index dfc2fa2a..bd308f84 100644
--- a/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-adb-sample/src/main/resources/application.properties
+++ b/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-adb-sample/src/main/resources/application.properties
@@ -2,4 +2,4 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-phoenix-1
-#spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
\ No newline at end of file
+spring.cloud.oci.config.type = file
\ No newline at end of file
diff --git a/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/java/com/oracle/cloud/spring/sample/genai/springcloudocigenaisample/EmbeddingModelController.java b/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/java/com/oracle/cloud/spring/sample/genai/springcloudocigenaisample/EmbeddingModelController.java
index 3bb8eae5..d3595d88 100644
--- a/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/java/com/oracle/cloud/spring/sample/genai/springcloudocigenaisample/EmbeddingModelController.java
+++ b/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/java/com/oracle/cloud/spring/sample/genai/springcloudocigenaisample/EmbeddingModelController.java
@@ -5,6 +5,8 @@
 
 package com.oracle.cloud.spring.sample.genai.springcloudocigenaisample;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -44,11 +46,15 @@ ResponseEntity<?> embed(@Parameter(required = true, example = "embedding input")
     @PostMapping(value = "embedAll")
     ResponseEntity<?> embed(@Parameter(required = true, example = "embedding text") @RequestBody List<String> inputs) {
         List<EmbedTextResponse> embedded = embeddingModel.embedAll(inputs);
-        List<Map<String, Object>> response = embedded.stream().map(r -> Map.of(
-                "inputs", r.getEmbedTextResult().getInputs(),
-                "opcRequestId", r.getOpcRequestId(),
-                "embeddings", embeddingModel.fromResponse(r)
-        )).toList();
+        List<Map<String, Object>> response = embedded.stream()
+            .map(r -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("inputs", r.getEmbedTextResult() != null ? r.getEmbedTextResult().getInputs() : Collections.emptyList());
+                map.put("opcRequestId", r.getOpcRequestId() != null ? r.getOpcRequestId() : "N/A");
+                map.put("embeddings", embeddingModel.fromResponse(r));
+                return map;
+            })
+            .toList();
         return ResponseEntity.ok().body(response);
     }
 }
diff --git a/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/resources/application.properties b/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/resources/application.properties
index 1a603477..d41a33a7 100644
--- a/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/resources/application.properties
+++ b/spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/resources/application.properties
@@ -12,3 +12,4 @@ spring.cloud.oci.genai.chat.compartment=${OCI_COMPARTMENT_ID}
 
 spring.cloud.oci.genai.chat.onDemandModelId=${OCI_CHAT_MODEL_ID}
 spring.cloud.oci.genai.embedding.onDemandModelId=${OCI_EMBEDDING_MODEL_ID}
+