diff --git a/core-services/document-grounding/pom.xml b/core-services/document-grounding/pom.xml
index 2e9c6c1bf..6f3eebe05 100644
--- a/core-services/document-grounding/pom.xml
+++ b/core-services/document-grounding/pom.xml
@@ -71,10 +71,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <!-- scope "provided" -->
     <dependency>
       <groupId>org.projectlombok</groupId>
diff --git a/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java
index 5d7527535..a366223ee 100644
--- a/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java
+++ b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java
@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.grounding;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.AiCoreService;
 import com.sap.ai.sdk.grounding.client.PipelinesApi;
 import com.sap.ai.sdk.grounding.client.RetrievalApi;
@@ -84,7 +83,6 @@ public RetrievalApi retrieval() {
    * @return a new client.
    * @since 1.17.0
    */
-  @Beta
   @Nonnull
   public GroundingClient withHeader(@Nonnull final String key, @Nonnull final String value) {
     final var newClient = new GroundingClient(this.service, this.basePath);
diff --git a/core-services/prompt-registry/pom.xml b/core-services/prompt-registry/pom.xml
index cb5c99c0b..4c2f8c430 100644
--- a/core-services/prompt-registry/pom.xml
+++ b/core-services/prompt-registry/pom.xml
@@ -73,10 +73,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
diff --git a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/OrchestrationConfigClient.java b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/OrchestrationConfigClient.java
index 5a9d1096b..62eb6f662 100644
--- a/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/OrchestrationConfigClient.java
+++ b/core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/OrchestrationConfigClient.java
@@ -4,7 +4,6 @@
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.AiCoreService;
 import com.sap.ai.sdk.prompt.registry.client.OrchestrationConfigsApi;
 import com.sap.ai.sdk.prompt.registry.model.AzureContentSafetyInputFilterConfig;
@@ -23,7 +22,6 @@
  *
  * @since 1.15.0
  */
-@Beta
 public class OrchestrationConfigClient extends OrchestrationConfigsApi {
 
   /**
diff --git a/core/src/main/java/com/sap/ai/sdk/core/common/ClientResponseHandler.java b/core/src/main/java/com/sap/ai/sdk/core/common/ClientResponseHandler.java
index b156d9ee2..1f0bef1b4 100644
--- a/core/src/main/java/com/sap/ai/sdk/core/common/ClientResponseHandler.java
+++ b/core/src/main/java/com/sap/ai/sdk/core/common/ClientResponseHandler.java
@@ -27,7 +27,6 @@
  * @param <R> The type of the error response.
  * @since 1.1.0
  */
-@Beta
 @Slf4j
 @RequiredArgsConstructor
 public class ClientResponseHandler<T, R extends ClientError, E extends ClientException>
diff --git a/core/src/main/java/com/sap/ai/sdk/core/common/ClientStreamingHandler.java b/core/src/main/java/com/sap/ai/sdk/core/common/ClientStreamingHandler.java
index 42be3df31..79fde4402 100644
--- a/core/src/main/java/com/sap/ai/sdk/core/common/ClientStreamingHandler.java
+++ b/core/src/main/java/com/sap/ai/sdk/core/common/ClientStreamingHandler.java
@@ -18,7 +18,6 @@
  * @param <R> The type of the error.
  * @since 1.2.0
  */
-@Beta
 @Slf4j
 public class ClientStreamingHandler<
         D extends StreamedDelta, R extends ClientError, E extends ClientException>
@@ -31,6 +30,7 @@ public class ClientStreamingHandler<
    * @return the current instance of {@link ClientStreamingHandler} with the changed object mapper
    */
   @Nonnull
+  @Beta
   public ClientStreamingHandler<D, R, E> objectMapper(@Nonnull final ObjectMapper jackson) {
     super.objectMapper(jackson);
     return this;
diff --git a/core/src/main/java/com/sap/ai/sdk/core/common/RequestLogContext.java b/core/src/main/java/com/sap/ai/sdk/core/common/RequestLogContext.java
index ddedf1f8f..cd0a15914 100644
--- a/core/src/main/java/com/sap/ai/sdk/core/common/RequestLogContext.java
+++ b/core/src/main/java/com/sap/ai/sdk/core/common/RequestLogContext.java
@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.core.common;
 
-import com.google.common.annotations.Beta;
 import java.util.Optional;
 import java.util.UUID;
 import javax.annotation.Nonnull;
@@ -20,7 +19,6 @@
  */
 @Slf4j
 @UtilityClass
-@Beta
 public class RequestLogContext {
 
   private static void setCallId(@Nonnull final String callId) {
diff --git a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiBatchInput.java b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiBatchInput.java
index 4144bb9c2..c98c425bb 100644
--- a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiBatchInput.java
+++ b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiBatchInput.java
@@ -25,7 +25,6 @@
  *
  * @since 1.20.0
  */
-@Beta
 @JsonSerialize(using = BatchInputSerializer.class)
 public class OpenAiBatchInput {
   private static final ObjectMapper mapper = getDefaultObjectMapper();
@@ -38,6 +37,7 @@ public class OpenAiBatchInput {
    *
    * @param chatCompletionRequests the list of chat completion requests to include in the batch
    */
+  @Beta
   public OpenAiBatchInput(@Nonnull final OpenAiChatCompletionRequest... chatCompletionRequests) {
     for (int i = 0; i < chatCompletionRequests.length; i++) {
       val request = chatCompletionRequests[i];
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClient.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClient.java
index 7afee8954..6e014f072 100644
--- a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClient.java
+++ b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClient.java
@@ -180,7 +180,6 @@ public CompletionPostResponse executeRequest(@Nonnull final CompletionPostReques
    * @return The completion output
    * @since 1.15.0
    */
-  @Beta
   @Nonnull
   public OrchestrationChatResponse chatCompletionUsingReference(
       @Nonnull final OrchestrationConfigReference reference) {
@@ -298,7 +297,6 @@ public EmbeddingsPostResponse embed(@Nonnull final EmbeddingsPostRequest request
    * @return a new client.
    * @since 1.11.0
    */
-  @Beta
   @Nonnull
   public OrchestrationClient withHeader(@Nonnull final String key, @Nonnull final String value) {
     final var newClient = new OrchestrationClient(this.executor);
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationConfigReference.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationConfigReference.java
index 7d0e1717e..7e9b3f324 100644
--- a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationConfigReference.java
+++ b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationConfigReference.java
@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.orchestration;
 
-import com.google.common.annotations.Beta;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -17,7 +16,6 @@
 @Value
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter(AccessLevel.PACKAGE)
-@Beta
 public class OrchestrationConfigReference {
   String id;
   String scenario;
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationJacksonConfiguration.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationJacksonConfiguration.java
index 318295557..914477591 100644
--- a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationJacksonConfiguration.java
+++ b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationJacksonConfiguration.java
@@ -19,7 +19,6 @@
  *
  * @since 1.2.0
  */
-@Beta
 @NoArgsConstructor(access = AccessLevel.NONE)
 public class OrchestrationJacksonConfiguration {
 
@@ -32,6 +31,7 @@ public class OrchestrationJacksonConfiguration {
    *     href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.html">Jackson2ObjectMapperBuilder</a>
    */
   @Nonnull
+  @Beta
   public static ObjectMapper getOrchestrationObjectMapper() {
 
     final var module =