diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 95c3bd2ed..60b51090a 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -26,8 +26,6 @@ updates:
         versions: [ ">=5.0.0" ]
       - dependency-name: "com.github.victools:jsonschema-module-jackson"
         versions: [ ">=5.0.0" ]
-      - dependency-name: "org.openapitools:openapi-generator"
-        versions: [ ">=7.23.0" ]
     groups:
       production-minor-patch:
         dependency-type: "production"
diff --git a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/ChatCompletionsRequestCommon.java b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/ChatCompletionsRequestCommon.java
index 8c87d5d09..f0ce4b1b0 100644
--- a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/ChatCompletionsRequestCommon.java
+++ b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/ChatCompletionsRequestCommon.java
@@ -39,7 +39,7 @@ public class ChatCompletionsRequestCommon
   private Boolean stream = false;
 
   @JsonProperty("stop")
-  private ChatCompletionsRequestCommonStop stop = null;
+  private ChatCompletionsRequestCommonStop stop;
 
   @JsonProperty("max_tokens")
   private Integer maxTokens = 4096;
diff --git a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/CreateChatCompletionRequest.java b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/CreateChatCompletionRequest.java
index ec77b447f..200d54ede 100644
--- a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/CreateChatCompletionRequest.java
+++ b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/CreateChatCompletionRequest.java
@@ -42,7 +42,7 @@ public class CreateChatCompletionRequest
   private Boolean stream = false;
 
   @JsonProperty("stop")
-  private CreateChatCompletionRequestAllOfStop stop = null;
+  private CreateChatCompletionRequestAllOfStop stop;
 
   @JsonProperty("max_tokens")
   private Integer maxTokens;
diff --git a/pom.xml b/pom.xml
index 715dbb290..4ac7ce8af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,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.32.0</cloud-sdk.version>
+    <cloud-sdk.version>5.33.0-SNAPSHOT</cloud-sdk.version>
     <junit-jupiter.version>6.1.0</junit-jupiter.version>
     <wiremock.version>3.13.2</wiremock.version>
     <assertj-core.version>3.27.7</assertj-core.version>
@@ -319,19 +319,6 @@
           <groupId>com.sap.cloud.sdk.datamodel</groupId>
           <artifactId>openapi-generator-maven-plugin</artifactId>
           <version>${cloud-sdk.version}</version>
-          <dependencies>
-            <!-- Handle regression in 7.23.0 -->
-            <dependency>
-              <groupId>org.openapitools</groupId>
-              <artifactId>openapi-generator</artifactId>
-              <version>7.22.0</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.openapitools</groupId>
-          <artifactId>openapi-generator-maven-plugin</artifactId>
-          <version>7.24.0</version>
         </plugin>
         <plugin>
           <groupId>com.github.siom79.japicmp</groupId>