diff --git a/README.md b/README.md
index f60ef630c..647950089 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.9
+* Boat Angular generator
+  * Use `>=` for main peer dependency to improve forward compatibility
 ## 0.15.8
 * *Boat Scaffold*
   * Makes sure to not autogenerate examples from schema if examples are already present
diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml
index 2ea781252..e81e2e9af 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.8</version>
+        <version>0.15.9-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 bbe5f1aa7..549edfe7c 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.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
     <artifactId>boat-maven-plugin</artifactId>
 
@@ -32,7 +32,7 @@
     </properties>
 
     <dependencyManagement>
-        <dependencies></dependencies>
+        <dependencies />
     </dependencyManagement>
 
     <dependencies>
@@ -217,7 +217,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>4.9.1</version>
+            <version>4.10.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml b/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml
index a5efa30fa..960b2f16f 100644
--- a/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml
+++ b/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml
@@ -64,7 +64,7 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v12.19.0</nodeVersion>
+                            <nodeVersion>v16.15.1</nodeVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -93,4 +93,3 @@
 
 
 </project>
-
diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml
index 0258ddf53..18bc87b06 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.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-quay-lint</artifactId>
@@ -99,4 +99,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml
index e40f63d2a..f0532c65b 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.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-quay-rules</artifactId>
@@ -17,7 +17,7 @@
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
         </sonar.coverage.jacoco.xmlReportPaths>
-        <kotlin.version>1.4.10</kotlin.version>
+        <kotlin.version>1.7.0</kotlin.version>
         <kotlin.compiler.incremental>false</kotlin.compiler.incremental>
         <auto-service.version>1.0-rc7</auto-service.version>
         <dokka.version>1.4.10.2</dokka.version>
@@ -172,4 +172,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml
index e47af268c..4c833621f 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.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
 
 
@@ -29,4 +29,4 @@
         <module>boat-quay-lint</module>
     </modules>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml
index ccbdb8480..708dbeffb 100644
--- a/boat-scaffold/pom.xml
+++ b/boat-scaffold/pom.xml
@@ -5,9 +5,9 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
-
+  
     <artifactId>boat-scaffold</artifactId>
 
     <packaging>jar</packaging>
@@ -38,6 +38,18 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars-jackson2</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.backbase.oss</groupId>
             <artifactId>boat-engine</artifactId>
@@ -87,7 +99,7 @@
         <dependency>
             <groupId>com.backbase.oss</groupId>
             <artifactId>boat-trail-resources</artifactId>
-            <version>0.15.8</version>
+            <version>0.15.9-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java
index 9304ad587..1034ac245 100644
--- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java
+++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java
@@ -225,10 +225,10 @@ private void addDependencies(SemVer angularVersion) {
             additionalProperties.put("rxjsVersion", "6.6.0");
 
             if (angularVersion.atLeast("11.0.0")) {
-                additionalProperties.put("tsVersion", "~4.1.0");
+                additionalProperties.put("tsVersion", ">=4.2.0");
                 additionalProperties.put("ngPackagrVersion", "11.0.0");
             } else {
-                additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0");
+                additionalProperties.put("tsVersion", ">=3.9.2");
                 additionalProperties.put("ngPackagrVersion", "10.0.3");
             }
         }
diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java
index ea2bdee19..b08fa96b9 100644
--- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java
+++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java
@@ -39,8 +39,7 @@ public TemplateSource sourceAt(String location) {
                 .newBuilder(bundle)
                 .resolver(
                         MapValueResolver.INSTANCE,
-                        JavaBeanValueResolver.INSTANCE,
-                        FieldValueResolver.INSTANCE)
+                        JavaBeanValueResolver.INSTANCE)
                 .build();
 
         Handlebars handlebars = new Handlebars(loader);
diff --git a/boat-scaffold/src/main/templates/boat-angular/package.mustache b/boat-scaffold/src/main/templates/boat-angular/package.mustache
index b1d2e6429..8b293c39d 100644
--- a/boat-scaffold/src/main/templates/boat-angular/package.mustache
+++ b/boat-scaffold/src/main/templates/boat-angular/package.mustache
@@ -15,26 +15,26 @@
     "build": "ng-packagr -p ng-package.json"
   },
   "peerDependencies": {
-    "@angular/core": "^{{ngVersion}}",
+    "@angular/core": ">={{ngVersion}}",
     {{#withMocks}}
-    "@backbase/foundation-ang": "^{{foundationVersion}}",
+    "@backbase/foundation-ang": ">={{foundationVersion}}",
     {{/withMocks}}
-    "rxjs": "^{{rxjsVersion}}"
+    "rxjs": ">={{rxjsVersion}}"
   },
   "devDependencies": {
-    "@angular/common": "~{{ngVersion}}",
-    "@angular/compiler": "~{{ngVersion}}",
-    "@angular/compiler-cli": "~{{ngVersion}}",
-    "@angular/core": "~{{ngVersion}}",
-    "@angular/platform-browser": "~{{ngVersion}}",
-    "ng-packagr": "^{{ngPackagrVersion}}",
+    "@angular/common": ">={{ngVersion}}",
+    "@angular/compiler": ">={{ngVersion}}",
+    "@angular/compiler-cli": ">={{ngVersion}}",
+    "@angular/core": ">={{ngVersion}}",
+    "@angular/platform-browser": ">={{ngVersion}}",
+    "ng-packagr": ">={{ngPackagrVersion}}",
     "reflect-metadata": "^0.1.3",
     {{#withMocks}}
-    "@backbase/foundation-ang": "~{{foundationVersion}}",
+    "@backbase/foundation-ang": ">={{foundationVersion}}",
     {{/withMocks}}
-    "rxjs": "~{{rxjsVersion}}",
+    "rxjs": ">={{rxjsVersion}}",
     "typescript": "{{{tsVersion}}}",
-    "zone.js": "^{{zonejsVersion}}"
+    "zone.js": ">={{zonejsVersion}}"
   }{{#npmRepository}},
   "publishConfig": {
     "registry": "{{{npmRepository}}}"
diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml
index 18c34227d..4c97f00e5 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.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-terminal</artifactId>
diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml
index 57a117694..01385651d 100644
--- a/boat-trail-resources/pom.xml
+++ b/boat-trail-resources/pom.xml
@@ -5,9 +5,9 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
-
+  
     <artifactId>boat-trail-resources</artifactId>
 
     <packaging>jar</packaging>
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..48e341a09
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
diff --git a/pom.xml b/pom.xml
index fad718949..a1cce9c0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.backbase.oss</groupId>
     <artifactId>backbase-openapi-tools</artifactId>
-    <version>0.15.8</version>
+    <version>0.15.9-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <description>Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more</description>
@@ -56,15 +56,15 @@
         <aggregate.report.dir>tests/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
         <sonar.coverage.jacoco.xmlReportPaths>${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
 
-        <lombok.version>1.18.16</lombok.version>
-        <jackson.version>2.11.3</jackson.version>
-        <mockito.version>3.8.0</mockito.version>
+        <lombok.version>1.18.24</lombok.version>
+        <jackson.version>2.13.3</jackson.version>
+        <mockito.version>4.6.1</mockito.version>
 
         <slf4j.version>1.7.30</slf4j.version>
         <swagger-core.version>2.1.5</swagger-core.version>
         <swagger-parser.version>2.0.23</swagger-parser.version>
         <snakeyaml.version>1.26</snakeyaml.version>
-        <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
     </properties>
 
     <modules>
@@ -98,7 +98,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
+                <version>1.2.9</version>
             </dependency>
 
 
diff --git a/tests/pom.xml b/tests/pom.xml
index b1293d97a..8bd8e888a 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.8</version>
+        <version>0.15.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests</artifactId>