diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml
index bf6dbca33..25b8d1238 100644
--- a/boat-maven-plugin/pom.xml
+++ b/boat-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
     <description>Open API Converter</description>
 
     <properties>
-        <maven.api.version>3.9.7</maven.api.version>
+        <maven.api.version>3.9.9</maven.api.version>
         <sonar.coverage.exclusions>
             src/main/java/com/backbase/oss/boat/GenerateMojo.java,
             src/main/java/com/backbase/oss/codegen/*.java
@@ -124,6 +124,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -352,9 +358,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.openapitools</groupId>
-                <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>${openapi-generator.version}</version>
+                <groupId>com.backbase.oss</groupId>
+                <artifactId>boat-maven-plugin</artifactId>
+                <version>0.17.50</version>
                 <executions>
                     <execution>
                         <goals>
@@ -374,6 +380,7 @@
                                 <library>feign</library>
                                 <dateLibrary>java8</dateLibrary>
                                 <additionalModelTypeAnnotations>@lombok.AllArgsConstructor @lombok.Builder </additionalModelTypeAnnotations>
+                                <useJakartaEe>true</useJakartaEe>
                             </configOptions>
                         </configuration>
                     </execution>