diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 55caf7aa..a4a2f386 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -82,7 +82,7 @@ log4j2-slf4j = { group= "org.apache.logging.log4j", name="log4j-slf4j2-impl", ve
 log4j2-core = { group= "org.apache.logging.log4j", name="log4j-core", version.ref="log4j2"}
 
 # Instrumented libraries
-openaiClient = "com.openai:openai-java:2.7.0"
+openaiClient = "com.openai:openai-java:2.12.0"
 
 [bundles]
 
diff --git a/instrumentation/openai-client-instrumentation/instrumentation-1.1/src/main/java/co/elastic/otel/openai/v1_1/OpenAiOkHttpClientBuilderInstrumentation.java b/instrumentation/openai-client-instrumentation/instrumentation-1.1/src/main/java/co/elastic/otel/openai/v1_1/OpenAiOkHttpClientBuilderInstrumentation.java
index 02ebecc3..a4e70787 100644
--- a/instrumentation/openai-client-instrumentation/instrumentation-1.1/src/main/java/co/elastic/otel/openai/v1_1/OpenAiOkHttpClientBuilderInstrumentation.java
+++ b/instrumentation/openai-client-instrumentation/instrumentation-1.1/src/main/java/co/elastic/otel/openai/v1_1/OpenAiOkHttpClientBuilderInstrumentation.java
@@ -51,7 +51,7 @@ public static class AdviceClass {
     public static OpenAIClient onExit(
         @Advice.Return OpenAIClient result,
         @Advice.FieldValue("clientOptions") ClientOptions.Builder clientOptions) {
-      return InstrumentedOpenAiClient.wrap(result).baseUrl(clientOptions.baseUrl()).build();
+      return InstrumentedOpenAiClient.wrap(result).baseUrl(clientOptions.build().baseUrl()).build();
     }
   }
 }