diff --git a/frameworks/Kotlin/hexagon/benchmark_config.json b/frameworks/Kotlin/hexagon/benchmark_config.json
index d9f60d20b6f..c98335451d2 100644
--- a/frameworks/Kotlin/hexagon/benchmark_config.json
+++ b/frameworks/Kotlin/hexagon/benchmark_config.json
@@ -49,11 +49,13 @@
                 "versus": "servlet"
             },
             "jettyloom-pgclient": {
+                "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
                 "fortune_url": "/fortunes",
                 "update_url": "/update?queries=",
                 "cached_query_url": "/cached-queries?count=",
+                "plaintext_url": "/plaintext",
                 "port": 9090,
                 "approach": "Realistic",
                 "classification": "Micro",
@@ -69,7 +71,7 @@
                 "notes": "http://hexagonkt.com",
                 "versus": "servlet"
             },
-            "netty": {
+            "nettyepoll": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -88,11 +90,11 @@
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Netty PostgreSQL",
+                "display_name": "Hexagon Netty Epoll PostgreSQL",
                 "notes": "http://hexagonkt.com",
                 "versus": "netty"
             },
-            "nettyepoll": {
+            "nettyepoll-async-pgclient": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -111,32 +113,11 @@
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Netty Epoll PostgreSQL",
+                "display_name": "Hexagon Netty Epoll Async PgClient",
                 "notes": "http://hexagonkt.com",
                 "versus": "netty"
             },
             "nettyepoll-pgclient": {
-                "db_url": "/db",
-                "query_url": "/query?queries=",
-                "fortune_url": "/fortunes",
-                "update_url": "/update?queries=",
-                "cached_query_url": "/cached-queries?count=",
-                "port": 9090,
-                "approach": "Realistic",
-                "classification": "Micro",
-                "database": "postgres",
-                "framework": "Hexagon",
-                "language": "Kotlin",
-                "orm": "Raw",
-                "platform": "Netty",
-                "webserver": "None",
-                "os": "Linux",
-                "database_os": "Linux",
-                "display_name": "Hexagon Netty Epoll PgClient",
-                "notes": "http://hexagonkt.com",
-                "versus": "netty"
-            },
-            "netty-native": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -155,11 +136,11 @@
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Netty Native PostgreSQL",
+                "display_name": "Hexagon Netty Epoll PgClient",
                 "notes": "http://hexagonkt.com",
                 "versus": "netty"
             },
-            "netty-async-pgclient": {
+            "nima": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -174,15 +155,15 @@
                 "framework": "Hexagon",
                 "language": "Kotlin",
                 "orm": "Raw",
-                "platform": "Netty",
+                "platform": "Helidon",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Netty Async PgClient",
+                "display_name": "Hexagon Nima PostgreSQL",
                 "notes": "http://hexagonkt.com",
-                "versus": "netty"
+                "versus": "helidon-nima"
             },
-            "nettyepoll-async-pgclient": {
+            "nima-pgclient": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -197,13 +178,13 @@
                 "framework": "Hexagon",
                 "language": "Kotlin",
                 "orm": "Raw",
-                "platform": "Netty",
+                "platform": "Helidon",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Vertx PgClient",
+                "display_name": "Hexagon Nima PgClient",
                 "notes": "http://hexagonkt.com",
-                "versus": "netty"
+                "versus": "helidon-nima"
             },
             "tomcat": {
                 "json_url": "/json",
diff --git a/frameworks/Kotlin/hexagon/build.gradle b/frameworks/Kotlin/hexagon/build.gradle
index f4a2ad995c7..fecbf1174e6 100644
--- a/frameworks/Kotlin/hexagon/build.gradle
+++ b/frameworks/Kotlin/hexagon/build.gradle
@@ -1,7 +1,7 @@
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.8.22" apply false
-    id "org.graalvm.buildtools.native" version "0.9.22" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.9.0" apply false
+    id "org.graalvm.buildtools.native" version "0.9.23" apply false
 }
 
 version = "1.0.0"
@@ -9,13 +9,13 @@ description = "TFB benchmark"
 group = "com.hexagonkt"
 
 ext {
-    hexagonVersion = "3.0.0-B3"
+    hexagonVersion = "3.0.0-B8"
     jettyVersion = "11.0.15"
-    nettyVersion = "4.1.93.Final"
+    nettyVersion = "4.1.94.Final"
 
     hikariVersion = "5.0.1"
     postgresqlVersion = "42.6.0"
-    vertxVersion = "4.4.3"
+    vertxVersion = "4.4.4"
     cache2kVersion = "2.6.1.Final"
 
     applicationClass = "com.hexagonkt.BenchmarkKt"
diff --git a/frameworks/Kotlin/hexagon/config.toml b/frameworks/Kotlin/hexagon/config.toml
index d30e5353e5a..5629b5a7d8d 100644
--- a/frameworks/Kotlin/hexagon/config.toml
+++ b/frameworks/Kotlin/hexagon/config.toml
@@ -55,7 +55,7 @@ platform = "Servlet"
 webserver = "None"
 versus = "servlet"
 
-[netty]
+[nettyepoll]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
@@ -73,7 +73,7 @@ platform = "Netty"
 webserver = "None"
 versus = "netty"
 
-[netty-native]
+[nettyepoll-async-pgclient]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
@@ -91,7 +91,7 @@ platform = "Netty"
 webserver = "None"
 versus = "netty"
 
-[nettyepoll]
+[nettyepoll-pgclient]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
@@ -109,7 +109,7 @@ platform = "Netty"
 webserver = "None"
 versus = "netty"
 
-[nettyepoll-pgclient]
+[nima]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
@@ -123,11 +123,11 @@ database = "postgres"
 database_os = "Linux"
 os = "Linux"
 orm = "Raw"
-platform = "Netty"
+platform = "Helidon"
 webserver = "None"
-versus = "netty"
+versus = "helidon-nima"
 
-[nettyepoll-async-pgclient]
+[nima-pgclient]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
@@ -141,9 +141,9 @@ database = "postgres"
 database_os = "Linux"
 os = "Linux"
 orm = "Raw"
-platform = "Netty"
+platform = "Helidon"
 webserver = "None"
-versus = "netty"
+versus = "helidon-nima"
 
 [tomcat]
 urls.plaintext = "/plaintext"
@@ -162,21 +162,3 @@ orm = "Raw"
 platform = "Servlet"
 webserver = "Tomcat"
 versus = "servlet"
-
-[nettyepoll-async-pgclient]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/query?queries="
-urls.update = "/update?queries="
-urls.fortune = "/fortunes"
-urls.cached_query = "/cached-queries?count="
-approach = "Realistic"
-classification = "Micro"
-database = "postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Raw"
-platform = "Netty"
-webserver = "None"
-versus = "netty"
diff --git a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29..033e24c4cdf 100644
Binary files a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar and b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties
index ed4fda0fcea..ab1eb5eecd1 100644
--- a/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties
+++ b/frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/frameworks/Kotlin/hexagon/gradlew b/frameworks/Kotlin/hexagon/gradlew
index aeb74cbb43e..fcb6fca147c 100755
--- a/frameworks/Kotlin/hexagon/gradlew
+++ b/frameworks/Kotlin/hexagon/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/frameworks/Kotlin/hexagon/hexagon-jetty-native.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jetty-native.dockerfile
deleted file mode 100644
index 223aae81894..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon-jetty-native.dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# BUILD
-#
-FROM ghcr.io/graalvm/native-image:ol9-java17-22.3.2 as build
-USER root
-WORKDIR /hexagon
-
-ADD . .
-RUN microdnf -y install findutils
-RUN ./gradlew --quiet classes
-RUN ./gradlew --quiet -x test nativeCompile
-
-#
-# RUNTIME
-#
-FROM scratch
-ARG PROJECT=hexagon_jetty_postgresql
-
-COPY --from=build /hexagon/$PROJECT/build/native/nativeCompile/$PROJECT /
-
-ENTRYPOINT [ "/hexagon_jetty_postgresql" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile
index 804555dae57..390ce706bc6 100644
--- a/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon-jettyloom-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile b/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile
index 1d64e9246dd..97809e8cc05 100644
--- a/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon-jettyloom.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-netty-async-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-netty-async-pgclient.dockerfile
deleted file mode 100644
index 09845f263cb..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon-netty-async-pgclient.dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# BUILD
-#
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
-USER root
-WORKDIR /hexagon
-
-ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
-
-#
-# RUNTIME
-#
-FROM docker.io/eclipse-temurin:17-jre-alpine
-ARG PROJECT=hexagon_netty_async_pgclient
-
-ENV POSTGRESQL_DB_HOST tfb-database
-ENV JDK_JAVA_OPTIONS -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
-
-COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
-
-ENTRYPOINT [ "/opt/hexagon_netty_async_pgclient/bin/hexagon_netty_async_pgclient" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-netty-native.dockerfile b/frameworks/Kotlin/hexagon/hexagon-netty-native.dockerfile
deleted file mode 100644
index 5443b48eb8f..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon-netty-native.dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# BUILD
-#
-FROM ghcr.io/graalvm/native-image:ol9-java17-22.3.2 as build
-USER root
-WORKDIR /hexagon
-
-ADD . .
-RUN microdnf -y install findutils
-RUN ./gradlew --quiet classes
-RUN ./gradlew --quiet -x test nativeCompile
-
-#
-# RUNTIME
-#
-FROM scratch
-ARG PROJECT=hexagon_netty_postgresql
-
-COPY --from=build /hexagon/$PROJECT/build/native/nativeCompile/$PROJECT /
-
-ENTRYPOINT [ "/hexagon_netty_postgresql" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-netty.dockerfile b/frameworks/Kotlin/hexagon/hexagon-netty.dockerfile
deleted file mode 100644
index 18fce97d813..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon-netty.dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# BUILD
-#
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
-USER root
-WORKDIR /hexagon
-
-ADD . .
-RUN gradle --quiet classes
-RUN gradle --quiet -x test installDist
-
-#
-# RUNTIME
-#
-FROM docker.io/eclipse-temurin:17-jre-alpine
-ARG PROJECT=hexagon_netty_postgresql
-
-ENV POSTGRESQL_DB_HOST tfb-database
-ENV JDK_JAVA_OPTIONS -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
-
-COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
-
-ENTRYPOINT [ "/opt/hexagon_netty_postgresql/bin/hexagon_netty_postgresql" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll-async-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll-async-pgclient.dockerfile
index 7e4c80d6cd4..aae9e180c7d 100644
--- a/frameworks/Kotlin/hexagon/hexagon-nettyepoll-async-pgclient.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon-nettyepoll-async-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile
index afe2e155ccc..e753730c6e4 100644
--- a/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon-nettyepoll-pgclient.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile
index c8a5592b67e..9b083b9683d 100644
--- a/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon-nettyepoll.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon-nima-pgclient.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nima-pgclient.dockerfile
new file mode 100644
index 00000000000..f99ae730145
--- /dev/null
+++ b/frameworks/Kotlin/hexagon/hexagon-nima-pgclient.dockerfile
@@ -0,0 +1,23 @@
+#
+# BUILD
+#
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
+USER root
+WORKDIR /hexagon
+
+ADD . .
+RUN gradle --quiet classes
+RUN gradle --quiet -x test installDist
+
+#
+# RUNTIME
+#
+FROM docker.io/eclipse-temurin:20-jre-alpine
+ARG PROJECT=hexagon_nima_pgclient
+
+ENV POSTGRESQL_DB_HOST tfb-database
+ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+
+COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
+
+ENTRYPOINT [ "/opt/hexagon_nima_pgclient/bin/hexagon_nima_pgclient" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-nima.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nima.dockerfile
new file mode 100644
index 00000000000..cfb1f55454d
--- /dev/null
+++ b/frameworks/Kotlin/hexagon/hexagon-nima.dockerfile
@@ -0,0 +1,23 @@
+#
+# BUILD
+#
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
+USER root
+WORKDIR /hexagon
+
+ADD . .
+RUN gradle --quiet classes
+RUN gradle --quiet -x test installDist
+
+#
+# RUNTIME
+#
+FROM docker.io/eclipse-temurin:20-jre-alpine
+ARG PROJECT=hexagon_nima_postgresql
+
+ENV POSTGRESQL_DB_HOST tfb-database
+ENV JDK_JAVA_OPTIONS --enable-preview -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+
+COPY --from=build /hexagon/$PROJECT/build/install/$PROJECT /opt/$PROJECT
+
+ENTRYPOINT [ "/opt/hexagon_nima_postgresql/bin/hexagon_nima_postgresql" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile b/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile
index e35db7b9f68..7fd1f9ca4e4 100644
--- a/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon-tomcat.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon.dockerfile b/frameworks/Kotlin/hexagon/hexagon.dockerfile
index 6bc878580ab..2cf68db7f9f 100644
--- a/frameworks/Kotlin/hexagon/hexagon.dockerfile
+++ b/frameworks/Kotlin/hexagon/hexagon.dockerfile
@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM docker.io/gradle:8.1.1-jdk17-alpine AS build
+FROM docker.io/gradle:8.2-jdk17-alpine AS build
 USER root
 WORKDIR /hexagon
 
diff --git a/frameworks/Kotlin/hexagon/hexagon_netty_async_pgclient/build.gradle b/frameworks/Kotlin/hexagon/hexagon_netty_async_pgclient/build.gradle
deleted file mode 100644
index f29d1703b61..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon_netty_async_pgclient/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-
-apply(from: "$gradleScripts/application.gradle")
-
-dependencies {
-    api(project(":store_pgclient_async"))
-    api("com.hexagonkt:http_server_netty_async:$hexagonVersion")
-}
diff --git a/frameworks/Kotlin/hexagon/hexagon_netty_async_pgclient/src/main/kotlin/Benchmark.kt b/frameworks/Kotlin/hexagon/hexagon_netty_async_pgclient/src/main/kotlin/Benchmark.kt
deleted file mode 100644
index e5a9de4c597..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon_netty_async_pgclient/src/main/kotlin/Benchmark.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hexagonkt
-
-import com.hexagonkt.async.Benchmark
-import com.hexagonkt.async.store.BenchmarkPgClientStore
-import com.hexagonkt.http.server.netty.async.NettyServerAdapter
-import com.hexagonkt.templates.rocker.RockerAdapter
-import io.netty.util.ResourceLeakDetector
-import io.netty.util.ResourceLeakDetector.Level.DISABLED
-import java.net.URL
-
-fun main() {
-    ResourceLeakDetector.setLevel(DISABLED)
-
-    System.setProperty("io.netty.buffer.checkBounds", "false")
-    System.setProperty("io.netty.buffer.checkAccessible", "false")
-
-    val settings = Settings()
-    val store = BenchmarkPgClientStore("postgresql")
-    val templateEngine = RockerAdapter()
-    val templateUrl = URL("classpath:fortunes.rocker.html")
-    val engine = NettyServerAdapter(bossGroupThreads = 48)
-
-    val benchmark = Benchmark(engine, store, templateEngine, templateUrl, settings)
-    benchmark.server.start()
-}
diff --git a/frameworks/Kotlin/hexagon/hexagon_netty_postgresql/src/main/kotlin/Benchmark.kt b/frameworks/Kotlin/hexagon/hexagon_netty_postgresql/src/main/kotlin/Benchmark.kt
deleted file mode 100644
index 2a95e7385fc..00000000000
--- a/frameworks/Kotlin/hexagon/hexagon_netty_postgresql/src/main/kotlin/Benchmark.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.hexagonkt
-
-import com.hexagonkt.http.server.netty.NettyServerAdapter
-import com.hexagonkt.store.BenchmarkSqlStore
-import com.hexagonkt.templates.rocker.RockerAdapter
-import io.netty.util.ResourceLeakDetector
-import io.netty.util.ResourceLeakDetector.Level.DISABLED
-import java.net.URL
-
-fun main() {
-    ResourceLeakDetector.setLevel(DISABLED)
-
-    System.setProperty("io.netty.buffer.checkBounds", "false")
-    System.setProperty("io.netty.buffer.checkAccessible", "false")
-
-    val settings = Settings()
-    val store = BenchmarkSqlStore("postgresql")
-    val templateEngine = RockerAdapter()
-    val templateUrl = URL("classpath:fortunes.rocker.html")
-    val engine = NettyServerAdapter()
-
-    val benchmark = Benchmark(engine, store, templateEngine, templateUrl, settings)
-    benchmark.server.start()
-}
diff --git a/frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle b/frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle
index 243fa57c121..d3ce42499e4 100644
--- a/frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle
+++ b/frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle
@@ -1,4 +1,5 @@
 
+apply(from: "$gradleScripts/native.gradle")
 apply(from: "$gradleScripts/application.gradle")
 
 dependencies {
diff --git a/frameworks/Kotlin/hexagon/hexagon_nima_pgclient/build.gradle b/frameworks/Kotlin/hexagon/hexagon_nima_pgclient/build.gradle
new file mode 100644
index 00000000000..86d2692a326
--- /dev/null
+++ b/frameworks/Kotlin/hexagon/hexagon_nima_pgclient/build.gradle
@@ -0,0 +1,7 @@
+
+apply(from: "$gradleScripts/application.gradle")
+
+dependencies {
+    api(project(":store_pgclient"))
+    api("com.hexagonkt:http_server_nima:$hexagonVersion")
+}
diff --git a/frameworks/Kotlin/hexagon/hexagon_nima_pgclient/src/main/kotlin/Benchmark.kt b/frameworks/Kotlin/hexagon/hexagon_nima_pgclient/src/main/kotlin/Benchmark.kt
new file mode 100644
index 00000000000..9df2914829b
--- /dev/null
+++ b/frameworks/Kotlin/hexagon/hexagon_nima_pgclient/src/main/kotlin/Benchmark.kt
@@ -0,0 +1,17 @@
+package com.hexagonkt
+
+import com.hexagonkt.core.urlOf
+import com.hexagonkt.http.server.nima.NimaServerAdapter
+import com.hexagonkt.store.BenchmarkPgClientStore
+import com.hexagonkt.templates.rocker.RockerAdapter
+
+fun main() {
+    val settings = Settings()
+    val store = BenchmarkPgClientStore("postgresql")
+    val templateEngine = RockerAdapter()
+    val templateUrl = urlOf("classpath:fortunes.rocker.html")
+    val engine = NimaServerAdapter()
+
+    val benchmark = Benchmark(engine, store, templateEngine, templateUrl, settings)
+    benchmark.server.start()
+}
diff --git a/frameworks/Kotlin/hexagon/hexagon_netty_postgresql/build.gradle b/frameworks/Kotlin/hexagon/hexagon_nima_postgresql/build.gradle
similarity index 70%
rename from frameworks/Kotlin/hexagon/hexagon_netty_postgresql/build.gradle
rename to frameworks/Kotlin/hexagon/hexagon_nima_postgresql/build.gradle
index 01884cb3583..2957919e905 100644
--- a/frameworks/Kotlin/hexagon/hexagon_netty_postgresql/build.gradle
+++ b/frameworks/Kotlin/hexagon/hexagon_nima_postgresql/build.gradle
@@ -4,5 +4,5 @@ apply(from: "$gradleScripts/native.gradle")
 
 dependencies {
     api(project(":store_sql"))
-    api("com.hexagonkt:http_server_netty:$hexagonVersion")
+    api("com.hexagonkt:http_server_nima:$hexagonVersion")
 }
diff --git a/frameworks/Kotlin/hexagon/hexagon_nima_postgresql/src/main/kotlin/Benchmark.kt b/frameworks/Kotlin/hexagon/hexagon_nima_postgresql/src/main/kotlin/Benchmark.kt
new file mode 100644
index 00000000000..16e4797e37a
--- /dev/null
+++ b/frameworks/Kotlin/hexagon/hexagon_nima_postgresql/src/main/kotlin/Benchmark.kt
@@ -0,0 +1,17 @@
+package com.hexagonkt
+
+import com.hexagonkt.core.urlOf
+import com.hexagonkt.http.server.nima.NimaServerAdapter
+import com.hexagonkt.store.BenchmarkSqlStore
+import com.hexagonkt.templates.rocker.RockerAdapter
+
+fun main() {
+    val settings = Settings()
+    val store = BenchmarkSqlStore("postgresql")
+    val templateEngine = RockerAdapter()
+    val templateUrl = urlOf("classpath:fortunes.rocker.html")
+    val engine = NimaServerAdapter()
+
+    val benchmark = Benchmark(engine, store, templateEngine, templateUrl, settings)
+    benchmark.server.start()
+}
diff --git a/frameworks/Kotlin/hexagon/settings.gradle b/frameworks/Kotlin/hexagon/settings.gradle
index cf4ad98fdac..2b234d2bbc6 100644
--- a/frameworks/Kotlin/hexagon/settings.gradle
+++ b/frameworks/Kotlin/hexagon/settings.gradle
@@ -9,8 +9,8 @@ include(
 
     "hexagon_jetty_pgclient",
     "hexagon_jetty_postgresql",
-    "hexagon_netty_postgresql",
-    "hexagon_netty_async_pgclient",
+    "hexagon_nima_pgclient",
+    "hexagon_nima_postgresql",
     "hexagon_nettyepoll_pgclient",
     "hexagon_nettyepoll_async_pgclient",
     "hexagon_nettyepoll_postgresql",