diff --git a/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java
index 6cc19b372..7f29322f2 100644
--- a/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java
+++ b/core-services/document-grounding/src/main/java/com/sap/ai/sdk/grounding/model/DocumentKeyValueListPair.java
@@ -85,7 +85,7 @@ public String toString() {
      * @return The enum value of type DocumentKeyValueListPair
      */
     @JsonCreator
-    @Nonnull
+    @Nullable
     public static MatchModeEnum fromValue(@Nonnull final String value) {
       for (MatchModeEnum b : MatchModeEnum.values()) {
         if (b.value.equals(value)) {
diff --git a/core/src/main/java/com/sap/ai/sdk/core/model/AiDeployment.java b/core/src/main/java/com/sap/ai/sdk/core/model/AiDeployment.java
index 1a77baca2..45cd9c71e 100644
--- a/core/src/main/java/com/sap/ai/sdk/core/model/AiDeployment.java
+++ b/core/src/main/java/com/sap/ai/sdk/core/model/AiDeployment.java
@@ -170,7 +170,7 @@ public String toString() {
      * @return The enum value of type AiDeployment
      */
     @JsonCreator
-    @Nonnull
+    @Nullable
     public static LastOperationEnum fromValue(@Nonnull final String value) {
       for (LastOperationEnum b : LastOperationEnum.values()) {
         if (b.value.equals(value)) {
diff --git a/core/src/main/java/com/sap/ai/sdk/core/model/AiDeploymentResponseWithDetails.java b/core/src/main/java/com/sap/ai/sdk/core/model/AiDeploymentResponseWithDetails.java
index b9440cbe9..a92e99de7 100644
--- a/core/src/main/java/com/sap/ai/sdk/core/model/AiDeploymentResponseWithDetails.java
+++ b/core/src/main/java/com/sap/ai/sdk/core/model/AiDeploymentResponseWithDetails.java
@@ -170,7 +170,7 @@ public String toString() {
      * @return The enum value of type AiDeploymentResponseWithDetails
      */
     @JsonCreator
-    @Nonnull
+    @Nullable
     public static LastOperationEnum fromValue(@Nonnull final String value) {
       for (LastOperationEnum b : LastOperationEnum.values()) {
         if (b.value.equals(value)) {
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/GroundingModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/GroundingModuleConfig.java
index 4e8799c17..42b6ca00a 100644
--- a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/GroundingModuleConfig.java
+++ b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/GroundingModuleConfig.java
@@ -73,7 +73,7 @@ public String toString() {
      * @return The enum value of type GroundingModuleConfig
      */
     @JsonCreator
-    @Nonnull
+    @Nullable
     public static TypeEnum fromValue(@Nonnull final String value) {
       for (TypeEnum b : TypeEnum.values()) {
         if (b.value.equals(value)) {
diff --git a/pom.xml b/pom.xml
index 957b72802..beaf7e2b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <maven.compiler.proc>full</maven.compiler.proc>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.outputTimestamp>2025-04-03T13:23:00Z</project.build.outputTimestamp>
-    <cloud-sdk.version>5.17.0</cloud-sdk.version>
+    <cloud-sdk.version>5.18.0</cloud-sdk.version>
     <junit-jupiter.version>5.12.2</junit-jupiter.version>
     <wiremock.version>3.12.1</wiremock.version>
     <assertj-core.version>3.27.3</assertj-core.version>