diff --git a/README.md b/README.md
index 492ba37cd..cebc445f3 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,9 @@ The project is very much Work In Progress and will be published on maven central
 
 # Release Notes
 BOAT is still under development and subject to change.
+## 0.15.3
+* *Boat Scaffold*
+ * A fix for mapping of Map for query params (in client code). 
 ## 0.15.2
 * *Maven Plugin*
   * Fixed handling of absolute file paths for linting OpenAPI specs
diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml
index d34ad2bb7..b0275aabf 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.15.2</version>
+        <version>0.15.3-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 07bd939d8..6084b6773 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.15.2</version>
+        <version>0.15.3-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 55837e372..64b2d554c 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.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
     <artifactId>boat-quay-lint</artifactId>
     <packaging>jar</packaging>
diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml
index 8bde40106..f562923f4 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.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
     <artifactId>boat-quay-rules</artifactId>
     <packaging>jar</packaging>
diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml
index 770e9946a..1a13a650a 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.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
 
 
diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml
index 207e63b4f..546e599ed 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.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
     <artifactId>boat-scaffold</artifactId>
 
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>com.backbase.oss</groupId>
             <artifactId>boat-trail-resources</artifactId>
-            <version>0.15.2</version>
+            <version>0.15.3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
index 6201bc6e6..cbb9232b3 100644
--- a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
@@ -492,6 +492,15 @@ public class ApiClient {
             collectionFormat = CollectionFormat.CSV;
         }
 
+        if (value instanceof Map) {
+            Map map = (Map) value;
+
+            for (Object key : map.keySet()) {
+                params.add(parameterToString(key), parameterToString(map.get(key)));
+            }
+            return params;
+        }
+
         Collection<?> valueCollection = null;
         if (value instanceof Collection) {
             valueCollection = (Collection<?>) value;
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
index 72b80bac8..1b22c2427 100644
--- a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
@@ -382,6 +382,15 @@ public class ApiClient {
             collectionFormat = CollectionFormat.CSV;
         }
 
+        if (value instanceof Map) {
+            Map map = (Map) value;
+
+            for (Object key : map.keySet()) {
+                params.add(parameterToString(key), parameterToString(map.get(key)));
+            }
+            return params;
+        }
+
         Collection<?> valueCollection = null;
         if (value instanceof Collection) {
             valueCollection = (Collection<?>) value;
diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml
index 5a23b9ee5..ef73ac21e 100644
--- a/boat-terminal/pom.xml
+++ b/boat-terminal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-terminal</artifactId>
diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml
index f159e4981..a3fea60ef 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.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
     <artifactId>boat-trail-resources</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 881f7a334..d3be6d8df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.backbase.oss</groupId>
     <artifactId>backbase-openapi-tools</artifactId>
-    <version>0.15.2</version>
+    <version>0.15.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more</description>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index d78a480a8..a3a64fa8e 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.15.2</version>
+        <version>0.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests</artifactId>