diff --git a/service-sdk/10.0.0/migrate-to-open-api/messaging-api/pom.xml b/service-sdk/10.0.0/migrate-to-open-api/messaging-api/pom.xml
index a02a261..fe3cdc4 100644
--- a/service-sdk/10.0.0/migrate-to-open-api/messaging-api/pom.xml
+++ b/service-sdk/10.0.0/migrate-to-open-api/messaging-api/pom.xml
@@ -15,52 +15,33 @@
     <name>Backbase :: Digital Banking Services :: messaging-api</name>
 
     <properties>
-        <codegen.angularVersion>8.0.0</codegen.angularVersion>
         <codegen.npmPackage.name>@backbase/message-http-ang</codegen.npmPackage.name>
         <codegen.npmPackage.version>${version}</codegen.npmPackage.version>
         <codegen.generateMocks>true</codegen.generateMocks>
         <codegen.apiModulePrefix>Message</codegen.apiModulePrefix>
+        <codegen.angularVersion>10.1.0</codegen.angularVersion>
+        <codegen.buildDist>dist/libs/transactions-http-ang</codegen.buildDist>
+        <codegen.serviceSuffix>HttpService</codegen.serviceSuffix>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.1</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
-                <groupId>org.openapitools</groupId>
-                <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>4.2.3</version>
+                <groupId>com.backbase.oss</groupId>
+                <artifactId>boat-maven-plugin</artifactId>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/src/main/resources/openapi.yaml</inputSpec>
+                            <generatorName>typescript-angular</generatorName>
+                            <additionalProperties>ngVersion=${codegen.angularVersion},npmName=${codegen.npmPackage.name},npmVersion=${codegen.npmPackage.version},withMocks=${codegen.generateMocks},apiModulePrefix=${codegen.apiModulePrefix},buildDist=${codegen.buildDist},serviceSuffix=${codegen.serviceSuffix}</additionalProperties>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <inputSpec>${project.basedir}/src/main/resources/openapi.yaml</inputSpec>
-                    <generatorName>backbase-typescript-angular</generatorName>
-                    <additionalProperties>ngVersion=${codegen.angularVersion},npmName=${codegen.npmPackage.name},npmVersion=${codegen.npmPackage.version},withMocks=${codegen.generateMocks},apiModulePrefix=${codegen.apiModulePrefix}</additionalProperties>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.backbase.bb-cli</groupId>
-                        <artifactId>backbase-typescript-angular-openapi-template</artifactId>
-                        <version>1.0.4</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <!--maven-jar-plugin is only including the OpenAPI spec and examples in the built artifact -->
             <plugin>