diff --git a/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc b/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc
index 0196a736c19..b09dacb9ee4 100644
--- a/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc
+++ b/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2025 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ Still, there might be cases where you wish to change configuration options from
 For details on the following options please see:
 
 * xref:../../se/webserver.adoc#_configuration_options[WebServer Configuration]
-* xref:../../config/io_helidon_webserver_ConnectionConfig.adoc[WebServer Connection Configuration]
 * xref:../../config/io_helidon_common_socket_SocketOptions.adoc[WebServer Socket Configuration]
 
 == Summary of Tuning Options
@@ -51,7 +50,6 @@ server:
 
   # Depends on the workload and kernel version
   backlog: NNNN
-  receive-buffer-size: NNNNN
   write-buffer-size: NNNNN
   write-queue-length: NN # 0 means direct write
 
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ConnectionConfigBlueprint.java b/webserver/webserver/src/main/java/io/helidon/webserver/ConnectionConfigBlueprint.java
index 81efb44aaf1..a617d8976c3 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/ConnectionConfigBlueprint.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/ConnectionConfigBlueprint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,12 @@
 
 /**
  * Configuration of a server connection (for each connection created by clients).
+ *
+ * @deprecated use {@link io.helidon.common.socket.SocketOptionsBlueprint} instead
  */
 @Prototype.Blueprint
 @Prototype.Configured
+@Deprecated(forRemoval = true, since = "4.2.0")
 interface ConnectionConfigBlueprint {
     /**
      * Default read timeout duration.
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java b/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java
index c5d1f6d70e5..82ada0dddcf 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,7 +151,10 @@ interface ListenerConfigBlueprint {
      * Listener receive buffer size.
      *
      * @return buffer size in bytes
+     * @deprecated use {@link SocketOptions#socketReceiveBufferSize()} instead
+     * via {@link #connectionOptions()}.
      */
+    @Deprecated(forRemoval = true, since = "4.2.0")
     @Option.Configured
     Optional<Integer> receiveBufferSize();
 
@@ -201,7 +204,9 @@ interface ListenerConfigBlueprint {
      * Configuration of a connection (established from client against our server).
      *
      * @return connection configuration
+     * @deprecated use {@link #connectionOptions()} instead
      */
+    @Deprecated(forRemoval = true, since = "4.2.0")
     @Option.Configured
     Optional<ConnectionConfig> connectionConfig();