diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml
index 776bed88a..89746680a 100644
--- a/boat-engine/pom.xml
+++ b/boat-engine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
     <artifactId>boat-engine</artifactId>
     <packaging>jar</packaging>
diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml
index 3c8e8aae0..00069a4aa 100644
--- a/boat-maven-plugin/pom.xml
+++ b/boat-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
     <artifactId>boat-maven-plugin</artifactId>
 
diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml
index 14df40cd7..db9b4ebf6 100644
--- a/boat-quay/boat-quay-lint/pom.xml
+++ b/boat-quay/boat-quay-lint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>boat-quay</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-quay-lint</artifactId>
diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml
index 0f48c13c5..609a524fd 100644
--- a/boat-quay/boat-quay-rules/pom.xml
+++ b/boat-quay/boat-quay-rules/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>boat-quay</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-quay-rules</artifactId>
diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml
index 7a2d7f695..277df7c25 100644
--- a/boat-quay/pom.xml
+++ b/boat-quay/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
 
 
diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml
index 479e70c16..6186671b7 100644
--- a/boat-scaffold/pom.xml
+++ b/boat-scaffold/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
   
     <artifactId>boat-scaffold</artifactId>
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.backbase.oss</groupId>
             <artifactId>boat-trail-resources</artifactId>
-            <version>0.18.0-SNAPSHOT</version>
+            <version>0.18.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java
index 633651516..66add1bf0 100644
--- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java
+++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java
@@ -206,8 +206,8 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo
     }
 
     /**
-     * "overridden" to fix invalid code when the data type is a collection of a fully qualified classname.
-     * eg. <code>Set<@Valid com.backbase.dbs.arrangement.commons.model.TranslationItemDto></code>
+     * "overridden" to fix invalid code when the data type is a collection of a fully qualified classname. eg. <code>Set<@Valid
+     * com.backbase.dbs.arrangement.commons.model.TranslationItemDto></code>
      *
      * @param itemsProperty
      * @param dataType
@@ -314,7 +314,12 @@ public void processOpts() {
             serializerTemplate + ".java"
         ));
         this.importMapping.put(serializerTemplate, modelPackage + "." + serializerTemplate);
-        this.importMapping.put("JsonSerialize", "com.fasterxml.jackson.databind.annotation.JsonSerialize");
+
+        if (this.additionalProperties.containsKey(USE_JACKSON_3)) {
+            this.importMapping.put("JsonSerialize", "tools.jackson.databind.annotation.JsonSerialize");
+        } else {
+            this.importMapping.put("JsonSerialize", "com.fasterxml.jackson.databind.annotation.JsonSerialize");
+        }
 
         if (this.additionalProperties.containsKey(ADD_SERVLET_REQUEST)) {
             this.addServletRequest = convertPropertyToBoolean(ADD_SERVLET_REQUEST);
diff --git a/boat-scaffold/src/main/templates/boat-spring/BigDecimalCustomSerializer.mustache b/boat-scaffold/src/main/templates/boat-spring/BigDecimalCustomSerializer.mustache
index a6dc40f30..33ec788b4 100644
--- a/boat-scaffold/src/main/templates/boat-spring/BigDecimalCustomSerializer.mustache
+++ b/boat-scaffold/src/main/templates/boat-spring/BigDecimalCustomSerializer.mustache
@@ -1,6 +1,11 @@
 package {{modelPackage}};
 
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializerBase;
+{{#useJackson3}}
+  import tools.jackson.databind.ser.std.ToStringSerializerBase;
+{{/useJackson3}}
+{{^useJackson3}}
+  import com.fasterxml.jackson.databind.ser.std.ToStringSerializerBase;
+{{/useJackson3}}
 import java.math.BigDecimal;
 
 public class BigDecimalCustomSerializer extends ToStringSerializerBase {
diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml
index b3e0c7f8f..082a6947e 100644
--- a/boat-trail-resources/pom.xml
+++ b/boat-trail-resources/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
   
     <artifactId>boat-trail-resources</artifactId>
diff --git a/pom.xml b/pom.xml
index bce873435..b140018c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.backbase.oss</groupId>
     <artifactId>backbase-openapi-tools</artifactId>
-    <version>0.18.0-SNAPSHOT</version>
+    <version>0.18.1-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <description>Backbase Open Api Tools is a collection of tools to work with Open API</description>
diff --git a/tests/pom.xml b/tests/pom.xml
index 90eee5d9c..116bc34b9 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests</artifactId>