diff --git a/jooby/pom.xml b/jooby/pom.xml
index 1f0d8e7a51..aaf1caf989 100644
--- a/jooby/pom.xml
+++ b/jooby/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby</artifactId>
   <name>jooby</name>
diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml
index 867031c7ee..7a81547207 100644
--- a/modules/jooby-apt/pom.xml
+++ b/modules/jooby-apt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-apt</artifactId>
   <name>jooby-apt</name>
diff --git a/modules/jooby-avaje-inject/pom.xml b/modules/jooby-avaje-inject/pom.xml
index 191c0e7e82..1f1173cf31 100644
--- a/modules/jooby-avaje-inject/pom.xml
+++ b/modules/jooby-avaje-inject/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-avaje-inject</artifactId>
   <name>jooby-avaje-inject</name>
diff --git a/modules/jooby-avaje-jsonb/pom.xml b/modules/jooby-avaje-jsonb/pom.xml
index adc53af031..1ad6a88204 100644
--- a/modules/jooby-avaje-jsonb/pom.xml
+++ b/modules/jooby-avaje-jsonb/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-avaje-jsonb</artifactId>
   <name>jooby-avaje-jsonb</name>
diff --git a/modules/jooby-avaje-validator/pom.xml b/modules/jooby-avaje-validator/pom.xml
index 5c7f84c203..a1c144b2ea 100644
--- a/modules/jooby-avaje-validator/pom.xml
+++ b/modules/jooby-avaje-validator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-avaje-validator</artifactId>
   <name>jooby-avaje-validator</name>
diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml
index 1f7c09818c..2aa0d75d31 100644
--- a/modules/jooby-awssdk-v1/pom.xml
+++ b/modules/jooby-awssdk-v1/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-awssdk-v1</artifactId>
   <name>jooby-awssdk-v1</name>
diff --git a/modules/jooby-awssdk-v2/pom.xml b/modules/jooby-awssdk-v2/pom.xml
index 296181ed57..7a8a483a88 100644
--- a/modules/jooby-awssdk-v2/pom.xml
+++ b/modules/jooby-awssdk-v2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-awssdk-v2</artifactId>
   <name>jooby-awssdk-v2</name>
diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml
index 934f22d3aa..4d9884579a 100644
--- a/modules/jooby-bom/pom.xml
+++ b/modules/jooby-bom/pom.xml
@@ -7,14 +7,14 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
 
   <groupId>io.jooby</groupId>
   <artifactId>jooby-bom</artifactId>
   <name>jooby-bom</name>
   <packaging>pom</packaging>
-  <version>3.11.4</version>
+  <version>3.11.5</version>
   <description>Jooby (Bill of Materials)</description>
   <url>https://jooby.io</url>
 
diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml
index dc68ec824f..865ffe12a0 100644
--- a/modules/jooby-caffeine/pom.xml
+++ b/modules/jooby-caffeine/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-caffeine</artifactId>
   <name>jooby-caffeine</name>
diff --git a/modules/jooby-camel/pom.xml b/modules/jooby-camel/pom.xml
index b131f0507d..e5a06f2a44 100644
--- a/modules/jooby-camel/pom.xml
+++ b/modules/jooby-camel/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-camel</artifactId>
   <name>jooby-camel</name>
diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml
index aa8870248b..e4a88f2588 100644
--- a/modules/jooby-cli/pom.xml
+++ b/modules/jooby-cli/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-cli</artifactId>
   <name>jooby-cli</name>
diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml
index 286123a1e5..2738793aab 100644
--- a/modules/jooby-commons-email/pom.xml
+++ b/modules/jooby-commons-email/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-commons-email</artifactId>
   <name>jooby-commons-email</name>
diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml
index d941a9a31f..ba49b72036 100644
--- a/modules/jooby-conscrypt/pom.xml
+++ b/modules/jooby-conscrypt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-conscrypt</artifactId>
   <name>jooby-conscrypt</name>
diff --git a/modules/jooby-db-scheduler/pom.xml b/modules/jooby-db-scheduler/pom.xml
index 6c39699f2e..8acf3c6384 100644
--- a/modules/jooby-db-scheduler/pom.xml
+++ b/modules/jooby-db-scheduler/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-db-scheduler</artifactId>
   <name>jooby-db-scheduler</name>
diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml
index 2f2bf3542a..91d2c3638e 100644
--- a/modules/jooby-distribution/pom.xml
+++ b/modules/jooby-distribution/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-distribution</artifactId>
   <name>jooby-distribution</name>
diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml
index 19e0c6d830..f610c02300 100644
--- a/modules/jooby-ebean/pom.xml
+++ b/modules/jooby-ebean/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-ebean</artifactId>
   <name>jooby-ebean</name>
diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml
index 96b43e588e..f7e42f51ad 100644
--- a/modules/jooby-flyway/pom.xml
+++ b/modules/jooby-flyway/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-flyway</artifactId>
   <name>jooby-flyway</name>
diff --git a/modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java b/modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java
index 63ca8df3ec..8642f2f0c5 100644
--- a/modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java
+++ b/modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java
@@ -5,14 +5,13 @@
  */
 package io.jooby.flyway;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 import javax.sql.DataSource;
 
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
+import org.flywaydb.core.api.migration.JavaMigration;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Extension;
@@ -48,6 +47,7 @@
 public class FlywayModule implements Extension {
 
   private final String name;
+  private List<JavaMigration> javaMigrations = List.of();
 
   /**
    * Creates a new Flyway module.
@@ -66,16 +66,30 @@ public FlywayModule() {
     this("db");
   }
 
+  /**
+   * The manually added Java-based migrations. These are not Java-based migrations discovered
+   * through classpath scanning and instantiated by Flyway. Instead, these are manually added
+   * instances of JavaMigration. This is particularly useful when working with a dependencies, where
+   * you may want to instantiate the class and wire up its dependencies.
+   *
+   * @param migrations The manually added Java-based migrations. An empty array if none.
+   * @return This module.
+   */
+  public FlywayModule javaMigrations(@NonNull JavaMigration... migrations) {
+    this.javaMigrations = List.of(migrations);
+    return this;
+  }
+
   @Override
   public void install(@NonNull Jooby application) throws Exception {
     var environment = application.getEnvironment();
     var registry = application.getServices();
     var dataSource = registry.getOrNull(ServiceKey.key(DataSource.class, name));
     if (dataSource == null) {
-      // TODO: replace with usage exception
       dataSource = registry.require(DataSource.class);
     }
     var configuration = new FluentConfiguration(environment.getClassLoader());
+    configuration.javaMigrations(javaMigrations.toArray(new JavaMigration[0]));
 
     var defaults = environment.getProperties("flyway");
     var overrides = environment.getProperties(name + ".flyway", "flyway");
diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml
index 45ce983f5b..3a53a933fa 100644
--- a/modules/jooby-freemarker/pom.xml
+++ b/modules/jooby-freemarker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-freemarker</artifactId>
   <name>jooby-freemarker</name>
diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml
index c1b4915edd..6c5c29fe2f 100644
--- a/modules/jooby-gradle-setup/pom.xml
+++ b/modules/jooby-gradle-setup/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-gradle-setup</artifactId>
   <name>jooby-gradle-setup</name>
diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml
index 0f342bf399..10f84a4258 100644
--- a/modules/jooby-graphiql/pom.xml
+++ b/modules/jooby-graphiql/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-graphiql</artifactId>
   <name>jooby-graphiql</name>
diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml
index 76de73dff9..c813c7e3d5 100644
--- a/modules/jooby-graphql/pom.xml
+++ b/modules/jooby-graphql/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-graphql</artifactId>
   <name>jooby-graphql</name>
diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml
index ad4d6ac69a..f136279c32 100644
--- a/modules/jooby-gson/pom.xml
+++ b/modules/jooby-gson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-gson</artifactId>
   <name>jooby-gson</name>
diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml
index cc36960d46..c55146070c 100644
--- a/modules/jooby-guice/pom.xml
+++ b/modules/jooby-guice/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-guice</artifactId>
   <name>jooby-guice</name>
diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml
index a39a5acdf7..23ad52acdb 100644
--- a/modules/jooby-handlebars/pom.xml
+++ b/modules/jooby-handlebars/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-handlebars</artifactId>
   <name>jooby-handlebars</name>
diff --git a/modules/jooby-hibernate-validator/pom.xml b/modules/jooby-hibernate-validator/pom.xml
index 064b812131..8ff1729311 100644
--- a/modules/jooby-hibernate-validator/pom.xml
+++ b/modules/jooby-hibernate-validator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-hibernate-validator</artifactId>
   <name>jooby-hibernate-validator</name>
diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml
index bd63de1b8f..d172a9f5ee 100644
--- a/modules/jooby-hibernate/pom.xml
+++ b/modules/jooby-hibernate/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-hibernate</artifactId>
   <name>jooby-hibernate</name>
diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml
index d925de8ec7..4358568f68 100644
--- a/modules/jooby-hikari/pom.xml
+++ b/modules/jooby-hikari/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-hikari</artifactId>
   <name>jooby-hikari</name>
diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml
index add7a5d1ab..3f045ebf2b 100644
--- a/modules/jooby-jackson/pom.xml
+++ b/modules/jooby-jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jackson</artifactId>
   <name>jooby-jackson</name>
diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml
index 3e5debf033..06594288ba 100644
--- a/modules/jooby-jasypt/pom.xml
+++ b/modules/jooby-jasypt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jasypt</artifactId>
   <name>jooby-jasypt</name>
diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml
index 5a228fa92c..90c5e47f2f 100644
--- a/modules/jooby-jdbi/pom.xml
+++ b/modules/jooby-jdbi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jdbi</artifactId>
   <name>jooby-jdbi</name>
diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml
index ec3a64ef17..53b28bd275 100644
--- a/modules/jooby-jetty/pom.xml
+++ b/modules/jooby-jetty/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jetty</artifactId>
   <name>jooby-jetty</name>
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java b/modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java
index fd5567f6e1..d615668270 100644
--- a/modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java
+++ b/modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java
@@ -26,7 +26,7 @@
 import org.eclipse.jetty.util.thread.Invocable;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ThreadPool;
-import org.eclipse.jetty.websocket.server.WebSocketUpgradeHandler;
+import org.eclipse.jetty.websocket.server.ServerWebSocketContainer;
 
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -236,13 +236,9 @@ public io.jooby.Server start(@NonNull Jooby... application) {
                 ? conf.getDuration("websocket.idleTimeout", TimeUnit.MILLISECONDS)
                 : TimeUnit.MINUTES.toMillis(5);
 
-        WebSocketUpgradeHandler.from(
-            server,
-            context,
-            container -> {
-              container.setMaxTextMessageSize(maxSize);
-              container.setIdleTimeout(Duration.ofMillis(timeout));
-            });
+        var container = ServerWebSocketContainer.ensure(server, context);
+        container.setMaxTextMessageSize(maxSize);
+        container.setIdleTimeout(Duration.ofMillis(timeout));
       }
       server.setHandler(context);
       server.start();
diff --git a/modules/jooby-jstachio/pom.xml b/modules/jooby-jstachio/pom.xml
index cbe23ada45..0e1816c4d1 100644
--- a/modules/jooby-jstachio/pom.xml
+++ b/modules/jooby-jstachio/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jstachio</artifactId>
   <name>jooby-jstachio</name>
diff --git a/modules/jooby-jte/pom.xml b/modules/jooby-jte/pom.xml
index a441be88df..9471fcb5a0 100644
--- a/modules/jooby-jte/pom.xml
+++ b/modules/jooby-jte/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jte</artifactId>
   <name>jooby-jte</name>
diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml
index 259cbb38af..a7171ae39e 100644
--- a/modules/jooby-jwt/pom.xml
+++ b/modules/jooby-jwt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-jwt</artifactId>
   <name>jooby-jwt</name>
diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml
index e68a9aacd2..ccc708c4ad 100644
--- a/modules/jooby-kafka/pom.xml
+++ b/modules/jooby-kafka/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-kafka</artifactId>
   <name>jooby-kafka</name>
diff --git a/modules/jooby-kotlin/pom.xml b/modules/jooby-kotlin/pom.xml
index e3e1b3e6ac..e7dd5a2364 100644
--- a/modules/jooby-kotlin/pom.xml
+++ b/modules/jooby-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-kotlin</artifactId>
   <name>jooby-kotlin</name>
diff --git a/modules/jooby-log4j/pom.xml b/modules/jooby-log4j/pom.xml
index d83a195b8e..1b70eae429 100644
--- a/modules/jooby-log4j/pom.xml
+++ b/modules/jooby-log4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-log4j</artifactId>
   <name>jooby-log4j</name>
diff --git a/modules/jooby-logback/pom.xml b/modules/jooby-logback/pom.xml
index 51cf6b413a..cb20442efc 100644
--- a/modules/jooby-logback/pom.xml
+++ b/modules/jooby-logback/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-logback</artifactId>
   <name>jooby-logback</name>
diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml
index 4e263e678b..8026683826 100644
--- a/modules/jooby-maven-plugin/pom.xml
+++ b/modules/jooby-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-maven-plugin</artifactId>
   <name>jooby-maven-plugin</name>
diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml
index bb8a05ae05..fbff796ee9 100644
--- a/modules/jooby-metrics/pom.xml
+++ b/modules/jooby-metrics/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-metrics</artifactId>
   <name>jooby-metrics</name>
diff --git a/modules/jooby-mutiny/pom.xml b/modules/jooby-mutiny/pom.xml
index 770616594f..6d21809b4b 100644
--- a/modules/jooby-mutiny/pom.xml
+++ b/modules/jooby-mutiny/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-mutiny</artifactId>
   <name>jooby-mutiny</name>
diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml
index 810c6747b0..6f4abedcb0 100644
--- a/modules/jooby-netty/pom.xml
+++ b/modules/jooby-netty/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-netty</artifactId>
   <name>jooby-netty</name>
diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml
index a267150412..cec2b2bc4f 100644
--- a/modules/jooby-openapi/pom.xml
+++ b/modules/jooby-openapi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-openapi</artifactId>
   <name>jooby-openapi</name>
diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml
index 8829a8e5a8..2f7780b0c8 100644
--- a/modules/jooby-pac4j/pom.xml
+++ b/modules/jooby-pac4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-pac4j</artifactId>
   <name>jooby-pac4j</name>
diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml
index a37c4232a2..ec64611372 100644
--- a/modules/jooby-pebble/pom.xml
+++ b/modules/jooby-pebble/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-pebble</artifactId>
   <name>jooby-pebble</name>
diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml
index e53b37fa22..50ffb51f89 100644
--- a/modules/jooby-quartz/pom.xml
+++ b/modules/jooby-quartz/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-quartz</artifactId>
   <name>jooby-quartz</name>
diff --git a/modules/jooby-reactor/pom.xml b/modules/jooby-reactor/pom.xml
index a0f7867e4d..15e0eede50 100644
--- a/modules/jooby-reactor/pom.xml
+++ b/modules/jooby-reactor/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-reactor</artifactId>
   <name>jooby-reactor</name>
diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml
index 8b1f832965..0a46e19060 100644
--- a/modules/jooby-redis/pom.xml
+++ b/modules/jooby-redis/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-redis</artifactId>
   <name>jooby-redis</name>
diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml
index 7b64bc2929..1fc804195a 100644
--- a/modules/jooby-redoc/pom.xml
+++ b/modules/jooby-redoc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-redoc</artifactId>
   <name>jooby-redoc</name>
diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml
index 5faebc687f..0217ccf069 100644
--- a/modules/jooby-rocker/pom.xml
+++ b/modules/jooby-rocker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-rocker</artifactId>
   <name>jooby-rocker</name>
diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml
index 65a1292054..c5f207d9ff 100644
--- a/modules/jooby-run/pom.xml
+++ b/modules/jooby-run/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-run</artifactId>
   <name>jooby-run</name>
diff --git a/modules/jooby-rxjava3/pom.xml b/modules/jooby-rxjava3/pom.xml
index 570a716a9b..7b603a3e9b 100644
--- a/modules/jooby-rxjava3/pom.xml
+++ b/modules/jooby-rxjava3/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-rxjava3</artifactId>
   <name>jooby-rxjava3</name>
diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml
index 65ec0180e0..060fe304e4 100644
--- a/modules/jooby-stork/pom.xml
+++ b/modules/jooby-stork/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
 
   <artifactId>jooby-stork</artifactId>
diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml
index 219978b5bc..35f2eafe26 100644
--- a/modules/jooby-swagger-ui/pom.xml
+++ b/modules/jooby-swagger-ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-swagger-ui</artifactId>
   <name>jooby-swagger-ui</name>
diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml
index aa7e0c6bb4..9d187ca015 100644
--- a/modules/jooby-test/pom.xml
+++ b/modules/jooby-test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-test</artifactId>
   <name>jooby-test</name>
diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml
index d289477549..13d114e404 100644
--- a/modules/jooby-thymeleaf/pom.xml
+++ b/modules/jooby-thymeleaf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-thymeleaf</artifactId>
   <name>jooby-thymeleaf</name>
diff --git a/modules/jooby-undertow/pom.xml b/modules/jooby-undertow/pom.xml
index 240b99004c..694e62dd10 100644
--- a/modules/jooby-undertow/pom.xml
+++ b/modules/jooby-undertow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-undertow</artifactId>
   <name>jooby-undertow</name>
diff --git a/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowWebSocket.java b/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowWebSocket.java
index 22b06de829..f9e8285a12 100644
--- a/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowWebSocket.java
+++ b/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowWebSocket.java
@@ -325,9 +325,7 @@ void fireConnect() {
           conf.hasPath("websocket.idleTimeout")
               ? conf.getDuration("websocket.idleTimeout", TimeUnit.MILLISECONDS)
               : TimeUnit.MINUTES.toMillis(5);
-      if (timeout > 0) {
-        channel.setIdleTimeout(timeout);
-      }
+      channel.setIdleTimeout(timeout);
       if (onConnectCallback != null) {
         dispatch(webSocketTask(() -> onConnectCallback.onConnect(this), true));
       } else {
diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml
index e64b84b746..2f50ffd735 100644
--- a/modules/jooby-whoops/pom.xml
+++ b/modules/jooby-whoops/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-whoops</artifactId>
   <name>jooby-whoops</name>
diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml
index 018fbb2f94..b99d2f5704 100644
--- a/modules/jooby-yasson/pom.xml
+++ b/modules/jooby-yasson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>jooby-yasson</artifactId>
   <name>jooby-yasson</name>
diff --git a/modules/pom.xml b/modules/pom.xml
index 0e6162ecf2..c7997140b4 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
 
   <artifactId>modules</artifactId>
diff --git a/pom.xml b/pom.xml
index 47c4ca5ac9..7efde0f9a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.jooby</groupId>
   <artifactId>jooby-project</artifactId>
-  <version>3.11.4</version>
+  <version>3.11.5</version>
   <packaging>pom</packaging>
 
   <name>jooby-project</name>
@@ -75,11 +75,11 @@
     <hibernate.version>6.6.33.Final</hibernate.version>
     <ebean.version>15.11.0</ebean.version>
     <jdbi.version>3.49.6</jdbi.version>
-    <flyway.version>11.14.0</flyway.version>
+    <flyway.version>11.15.0</flyway.version>
     <graphql-java.version>24.1</graphql-java.version>
     <lettuce.version>6.7.1.RELEASE</lettuce.version>
     <commons-pool2.version>2.12.1</commons-pool2.version>
-    <kafka.version>4.0.0</kafka.version>
+    <kafka.version>4.1.0</kafka.version>
     <caffeine.version>3.2.2</caffeine.version>
 
     <config.version>1.4.5</config.version>
@@ -106,12 +106,12 @@
 
     <!-- Server -->
     <undertow.version>2.3.20.Final</undertow.version>
-    <jetty.version>12.1.2</jetty.version>
+    <jetty.version>12.1.3</jetty.version>
     <netty.version>4.2.7.Final</netty.version>
 
     <!--OpenAPI-->
     <swagger.version>2.2.39</swagger.version>
-    <swagger-parser.version>2.1.31</swagger-parser.version>
+    <swagger-parser.version>2.1.35</swagger-parser.version>
     <redoc.version>2.0.0-rc.20</redoc.version>
 
     <!-- SSL -->
@@ -119,7 +119,7 @@
 
     <!-- avaje -->
     <avaje.inject.version>11.6</avaje.inject.version>
-    <avaje.jsonb.version>3.6</avaje.jsonb.version>
+    <avaje.jsonb.version>3.8</avaje.jsonb.version>
     <avaje.validator.version>2.14</avaje.validator.version>
 
     <!-- jakarta -->
@@ -132,7 +132,7 @@
     <okhttp.version>5.2.1</okhttp.version>
     <jsonwebtoken.version>0.13.0</jsonwebtoken.version>
     <pac4j.version>6.2.2</pac4j.version>
-    <quartz.version>2.5.0</quartz.version>
+    <quartz.version>2.5.1</quartz.version>
     <cron-utils.version>9.2.1</cron-utils.version>
     <bucket4j-core.version>8.0.1</bucket4j-core.version>
     <aws-java-sdk.version>1.12.792</aws-java-sdk.version>
@@ -149,7 +149,7 @@
     <!-- Test dependencies -->
     <jacoco.version>0.8.14</jacoco.version>
     <junit.version>6.0.0</junit.version>
-    <rest-assured.version>5.5.5</rest-assured.version>
+    <rest-assured.version>5.5.6</rest-assured.version>
     <assertj-core.version>3.27.3</assertj-core.version>
     <mockito.version>5.20.0</mockito.version>
     <guava.version>33.5.0-jre</guava.version>
@@ -207,7 +207,7 @@
     <!--  Javadoc is too strict in 17, don't fail on error -->
     <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssa</maven.build.timestamp.format>
-    <project.build.outputTimestamp>2025-10-20T12:43:04Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-10-27T14:29:18Z</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <pre-commit-hook>etc${file.separator}source${file.separator}formatter.sh</pre-commit-hook>
diff --git a/tests/pom.xml b/tests/pom.xml
index b1e42a4ae1..4199e0593b 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.5</version>
   </parent>
   <artifactId>tests</artifactId>
   <name>tests</name>