diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/ApiClient.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/ApiClient.mustache
index 21040c482afa..91fedcfc48de 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/ApiClient.mustache
@@ -14,7 +14,9 @@ import org.openapitools.jackson.nullable.JsonNullableModule;
 
 import io.helidon.config.Config;
 {{#jsonb}}
+{{#x-helidon-v3}}
 import io.helidon.media.jsonb.JsonbSupport;
+{{/x-helidon-v3}}
 {{/jsonb}}
 {{#jackson}}{{#x-helidon-v3}}{{!
 }}import io.helidon.media.jackson.JacksonSupport;
@@ -260,9 +262,11 @@ public class ApiClient {
                   .baseUri("{{basePath}}")
                   .config(clientConfig());
       {{#jsonb}}
+      {{#x-helidon-v3}}
       defaultWebClientBuilder.addMediaSupport(jsonbConfig == null
                 ? JsonbSupport.create()
                 : JsonbSupport.create(JsonbBuilder.create(jsonbConfig)));
+      {{/x-helidon-v3}}
       {{/jsonb}}
       {{#jackson}}
       defaultWebClientBuilder.addMediaSupport(objectMapper == null
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache
index 034dc0a903a6..206ae1890dcc 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache
@@ -25,7 +25,7 @@ import io.helidon.config.Config;
 }}import io.helidon.http.Method;
 import io.helidon.http.media.MediaSupport;
 {{/x-helidon-v3}}
-{{#jsonb}}import io.helidon.media.jsonb.JsonbSupport;{{/jsonb}}
+{{#jsonb}}{{#x-helidon-v3}}import io.helidon.media.jsonb.JsonbSupport;{{/x-helidon-v3}}{{/jsonb}}
 {{#jackson}}import io.helidon{{^x-helidon-v3}}.http{{/x-helidon-v3}}.media.jackson.JacksonSupport;{{/jackson}}
 {{#x-helidon-v3}}import io.helidon.webclient.WebClientRequestBuilder;
 import io.helidon.webclient.WebClientResponse;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl_for_v4.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl_for_v4.mustache
index 39aacae7b945..30dfc13b3b83 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl_for_v4.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl_for_v4.mustache
@@ -15,7 +15,7 @@ import io.helidon.common.GenericType;
 import io.helidon.common.media.type.MediaType;
 import io.helidon.config.Config;
 import io.helidon.http.media.MediaSupport;
-{{#jsonb}}import io.helidon.http.media.jsonb.JsonbSupport;{{/jsonb}}
+{{#jsonb}}{{#x-helidon-v3}}import io.helidon.http.media.jsonb.JsonbSupport;{{/x-helidon-v3}}{{/jsonb}}
 {{#jackson}}import io.helidon.http.media.jackson.JacksonSupport;{{/jackson}}
 import io.helidon.webclient.api.HttpClientRequest;
 import io.helidon.webclient.api.HttpClientResponse;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pom.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pom.mustache
index fbef9ba28358..2609eaf31370 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pom.mustache
@@ -63,8 +63,8 @@
             <artifactId>{{x-helidon-rootJavaEEDepPrefix}}.json.bind-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.http.media</groupId>
-            <artifactId>helidon-http1media-jsonb</artifactId>
+            <groupId>io.helidon.{{^x-helidon-v3}}http.{{/x-helidon-v3}}media</groupId>
+            <artifactId>helidon-{{^x-helidon-v3}}http-{{/x-helidon-v3}}jsonb</artifactId>
         </dependency>
 {{/jsonb}}
         <dependency>
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/main.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/main.mustache
index ca4e2b1b49dc..b244a1e04205 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/main.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/main.mustache
@@ -72,7 +72,9 @@ public final class Main {
                                     .config(config.get("server"))
                                     .addMediaSupport(JsonpSupport.create())
 {{#jsonb}}
+{{#x-helidon-v3}}
                                     .addMediaSupport(JsonbSupport.create())
+{{/x-helidon-v3}}
 {{/jsonb}}
 {{#jackson}}
                                     .addMediaSupport(JacksonSupport.create(JsonProvider.objectMapper()))
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pom.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pom.mustache
index bea047616388..78012eb76445 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pom.mustache
@@ -108,8 +108,8 @@
 {{/jackson}}
 {{#jsonb}}
         <dependency>
-            <groupId>io.helidon.{{#x-helidon-v3}}http.{{/x-helidon-v3}}media</groupId>
-            <artifactId>helidon-{{#x-helidon-v3}}http-{{/x-helidon-v3}}media-jsonb</artifactId>
+            <groupId>io.helidon.{{^x-helidon-v3}}http.{{/x-helidon-v3}}media</groupId>
+            <artifactId>helidon-{{^x-helidon-v3}}http-{{/x-helidon-v3}}media-jsonb</artifactId>
         </dependency>
 {{/jsonb}}
         <dependency>