diff --git a/README.md b/README.md
index 0b256ae4..c2db685a 100644
--- a/README.md
+++ b/README.md
@@ -54,15 +54,15 @@ jbang alias add --name=zw \
     --repos=mavencentral,snapshots=https://s01.oss.sonatype.org/content/repositories/snapshots \
     --deps=\
 org.slf4j:slf4j-simple:1.7.36,\
-io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-spring-cloud-streams3:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-jsonschema2pojo:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:openapi-spring-webtestclient:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:openapi-rest-assured:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:jdl-backend-application-default:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-openapi:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-asyncapi:0.9.9-SNAPSHOT,\
-io.github.zenwave360.zenwave-code-generator.plugins:jdl-openapi-controllers:0.9.9-SNAPSHOT \
-    io.github.zenwave360.zenwave-code-generator:zenwave-code-generator-cli:0.9.9-SNAPSHOT
+io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-spring-cloud-streams3:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-jsonschema2pojo:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:openapi-spring-webtestclient:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:openapi-rest-assured:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:jdl-backend-application-default:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-openapi:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-asyncapi:0.9.10-SNAPSHOT,\
+io.github.zenwave360.zenwave-code-generator.plugins:jdl-openapi-controllers:0.9.10-SNAPSHOT \
+    io.github.zenwave360.zenwave-code-generator:zenwave-code-generator-cli:0.9.10-SNAPSHOT
 ```
 
 You can include any **custom plugin** jars in the `--deps` option.
@@ -205,7 +205,7 @@ jbang zw -p io.zenwave360.generator.plugins.ForkPlugin -h
 | `targetFolder`          |                                                                                     | String   |                                                                                   |            |
 | `sourcePluginClassName` | Plugin Plugin class to fork                                                         | String   |                                                                                   |            |
 | `targetPluginClassName` | New Plugin Plugin class. It will be used for class name, package and maven groupId. | String   |                                                                                   |            |
-| `downloadURL`           | Download URL for the source code of original plugin in zip format                   | URL      | https://github.com/ZenWave360/zenwave-code-generator/archive/refs/tags/v0.9.8.zip |            |
+| `downloadURL`           | Download URL for the source code of original plugin in zip format                   | URL      | https://github.com/ZenWave360/zenwave-code-generator/archive/refs/tags/v0.9.9.zip |            |
 
 Example:
 
diff --git a/jbang-catalog.json b/jbang-catalog.json
index 72c211e8..fa3d2be6 100644
--- a/jbang-catalog.json
+++ b/jbang-catalog.json
@@ -17,17 +17,17 @@
       "main": "io.zenwave360.generator.Main"
     },
     "snapshots": {
-      "script-ref": "io.github.zenwave360.zenwave-code-generator:zenwave-code-generator-cli:0.9.9-SNAPSHOT",
+      "script-ref": "io.github.zenwave360.zenwave-code-generator:zenwave-code-generator-cli:0.9.10-SNAPSHOT",
       "dependencies": [
         "org.slf4j:slf4j-simple:1.7.36",
-        "io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-spring-cloud-streams3:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-jsonschema2pojo:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:openapi-spring-webtestclient:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:openapi-rest-assured:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-backend-application-default:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-openapi:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-asyncapi:0.9.9-SNAPSHOT",
-        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-openapi-controllers:0.9.9-SNAPSHOT"
+        "io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-spring-cloud-streams3:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:asyncapi-jsonschema2pojo:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:openapi-spring-webtestclient:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:openapi-rest-assured:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-backend-application-default:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-openapi:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-to-asyncapi:0.9.10-SNAPSHOT",
+        "io.github.zenwave360.zenwave-code-generator.plugins:jdl-openapi-controllers:0.9.10-SNAPSHOT"
       ],
       "repositories": [
         "mavencentral",
diff --git a/zenwave-code-generator-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java b/zenwave-code-generator-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java
index c1a0f731..1fac9c10 100644
--- a/zenwave-code-generator-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java
+++ b/zenwave-code-generator-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java
@@ -41,7 +41,7 @@ public class ForkPluginGenerator implements Generator {
     public String targetPluginClassName;
 
     @DocumentedOption(description = "Download URL for the source code of original plugin in zip format", required = false)
-    public URL downloadURL = new URL("https://github.com/ZenWave360/zenwave-code-generator/archive/refs/tags/v0.9.8.zip");
+    public URL downloadURL = new URL("https://github.com/ZenWave360/zenwave-code-generator/archive/refs/tags/v0.9.9.zip");
 
     @DocumentedOption
     public String targetFolder;