diff --git a/doc/connectivity/networking/net_config_guide.rst b/doc/connectivity/networking/net_config_guide.rst
index 34c531ec2ad..e2638eda4a0 100644
--- a/doc/connectivity/networking/net_config_guide.rst
+++ b/doc/connectivity/networking/net_config_guide.rst
@@ -83,7 +83,7 @@ Connection Options
 Socket Options
 **************
 
-:kconfig:option:`CONFIG_NET_SOCKETS_POLL_MAX`
+:kconfig:option:`CONFIG_ZVFS_POLL_MAX`
   Maximum number of supported poll() entries. One needs to select proper value here depending
   on how many BSD sockets are polled in the system.
 
diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index bdc3824bc2f..1c00ac02f11 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -474,6 +474,9 @@ Networking
 * The ``work_q`` parameter to ``NET_SOCKET_SERVICE_SYNC_DEFINE`` and
   ``NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC`` has been removed as it was always ignored. (:github:`79446`)
 
+* Deprecated the :kconfig:option:`CONFIG_NET_SOCKETS_POLL_MAX` option in favour of
+  :kconfig:option:`CONFIG_ZVFS_POLL_MAX`.
+
 Other Subsystems
 ****************
 
diff --git a/doc/services/portability/posix/kconfig/index.rst b/doc/services/portability/posix/kconfig/index.rst
index 7c7055326df..e414d508f19 100644
--- a/doc/services/portability/posix/kconfig/index.rst
+++ b/doc/services/portability/posix/kconfig/index.rst
@@ -17,7 +17,7 @@ implementation of the POSIX API.
 * :kconfig:option:`CONFIG_MSG_SIZE_MAX`
 * :kconfig:option:`CONFIG_NET_SOCKETPAIR`
 * :kconfig:option:`CONFIG_NET_SOCKETS`
-* :kconfig:option:`CONFIG_NET_SOCKETS_POLL_MAX`
+* :kconfig:option:`CONFIG_ZVFS_POLL_MAX`
 * :kconfig:option:`CONFIG_ZVFS_OPEN_MAX`
 * :kconfig:option:`CONFIG_POSIX_API`
 * :kconfig:option:`CONFIG_POSIX_OPEN_MAX`
diff --git a/drivers/modem/modem_socket.c b/drivers/modem/modem_socket.c
index cc3d93c5c9b..a30528ba899 100644
--- a/drivers/modem/modem_socket.c
+++ b/drivers/modem/modem_socket.c
@@ -269,7 +269,7 @@ int modem_socket_poll(struct modem_socket_config *cfg, struct zsock_pollfd *fds,
 	int ret, i;
 	uint8_t found_count = 0;
 
-	if (!cfg || nfds > CONFIG_NET_SOCKETS_POLL_MAX) {
+	if (!cfg || nfds > CONFIG_ZVFS_POLL_MAX) {
 		return -EINVAL;
 	}
 	struct k_poll_event events[nfds];
diff --git a/include/zephyr/net/dns_resolve.h b/include/zephyr/net/dns_resolve.h
index 283b2f90f8e..fecb87664d7 100644
--- a/include/zephyr/net/dns_resolve.h
+++ b/include/zephyr/net/dns_resolve.h
@@ -141,9 +141,9 @@ enum dns_query_type {
 /** How many sockets the dispatcher is able to poll. */
 #define DNS_DISPATCHER_MAX_POLL (DNS_RESOLVER_MAX_POLL + MDNS_MAX_POLL + LLMNR_MAX_POLL)
 
-#if defined(CONFIG_NET_SOCKETS_POLL_MAX)
-BUILD_ASSERT(CONFIG_NET_SOCKETS_POLL_MAX >= DNS_DISPATCHER_MAX_POLL,
-	     "CONFIG_NET_SOCKETS_POLL_MAX must be larger than " STRINGIFY(DNS_DISPATCHER_MAX_POLL));
+#if defined(CONFIG_ZVFS_POLL_MAX)
+BUILD_ASSERT(CONFIG_ZVFS_POLL_MAX >= DNS_DISPATCHER_MAX_POLL,
+	     "CONFIG_ZVFS_POLL_MAX must be larger than " STRINGIFY(DNS_DISPATCHER_MAX_POLL));
 #endif
 
 /** @brief What is the type of the socket given to DNS socket dispatcher,
diff --git a/lib/os/zvfs/Kconfig b/lib/os/zvfs/Kconfig
index df107c24c62..101e2cce086 100644
--- a/lib/os/zvfs/Kconfig
+++ b/lib/os/zvfs/Kconfig
@@ -43,6 +43,7 @@ if ZVFS_POLL
 
 config ZVFS_POLL_MAX
 	int "Max number of supported zvfs_poll() entries"
+	default NET_SOCKETS_POLL_MAX if NET_SOCKETS_POLL_MAX > 0
 	default 6 if WIFI_NM_WPA_SUPPLICANT
 	default 4 if SHELL_BACKEND_TELNET
 	default 3
diff --git a/samples/net/cloud/tagoio_http_post/prj.conf b/samples/net/cloud/tagoio_http_post/prj.conf
index 9746de5e077..9a4178d7f8a 100644
--- a/samples/net/cloud/tagoio_http_post/prj.conf
+++ b/samples/net/cloud/tagoio_http_post/prj.conf
@@ -17,7 +17,7 @@ CONFIG_NET_SHELL=y
 
 # Sockets
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/net/dns_resolve/prj.conf b/samples/net/dns_resolve/prj.conf
index 399b1bce9f2..de837ae0828 100644
--- a/samples/net/dns_resolve/prj.conf
+++ b/samples/net/dns_resolve/prj.conf
@@ -14,7 +14,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=n
 
-CONFIG_NET_SOCKETS_POLL_MAX=5
+CONFIG_ZVFS_POLL_MAX=5
 CONFIG_ZVFS_OPEN_MAX=5
 
 # Enable the DNS resolver
diff --git a/samples/net/mdns_responder/prj.conf b/samples/net/mdns_responder/prj.conf
index c89c505c62a..4bc9b6b13d2 100644
--- a/samples/net/mdns_responder/prj.conf
+++ b/samples/net/mdns_responder/prj.conf
@@ -8,7 +8,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IF_MAX_IPV6_COUNT=3
 CONFIG_NET_IF_MAX_IPV4_COUNT=3
 
-CONFIG_NET_SOCKETS_POLL_MAX=7
+CONFIG_ZVFS_POLL_MAX=7
 
 CONFIG_NET_HOSTNAME_ENABLE=y
 CONFIG_NET_HOSTNAME_UNIQUE=n
diff --git a/samples/net/sockets/coap_client/prj.conf b/samples/net/sockets/coap_client/prj.conf
index 1e9daa2e44c..7748f1dbbfc 100644
--- a/samples/net/sockets/coap_client/prj.conf
+++ b/samples/net/sockets/coap_client/prj.conf
@@ -5,7 +5,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 CONFIG_POSIX_API=y
 
 CONFIG_COAP=y
diff --git a/samples/net/sockets/coap_server/prj.conf b/samples/net/sockets/coap_server/prj.conf
index 94ac1abd5cf..9fdbcb99c20 100644
--- a/samples/net/sockets/coap_server/prj.conf
+++ b/samples/net/sockets/coap_server/prj.conf
@@ -6,7 +6,7 @@ CONFIG_NET_UDP=y
 # Socket
 CONFIG_NET_SOCKETS=y
 CONFIG_POSIX_API=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 
 # CoAP
 CONFIG_COAP=y
diff --git a/samples/net/sockets/echo_async/prj.conf b/samples/net/sockets/echo_async/prj.conf
index 0de41968710..77cc25261f8 100644
--- a/samples/net/sockets/echo_async/prj.conf
+++ b/samples/net/sockets/echo_async/prj.conf
@@ -8,7 +8,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=5
+CONFIG_ZVFS_POLL_MAX=5
 
 CONFIG_POSIX_API=y
 
diff --git a/samples/net/sockets/echo_async/src/socket_echo.c b/samples/net/sockets/echo_async/src/socket_echo.c
index b38eb62c001..60067baf91c 100644
--- a/samples/net/sockets/echo_async/src/socket_echo.c
+++ b/samples/net/sockets/echo_async/src/socket_echo.c
@@ -35,8 +35,8 @@
 #endif
 
 /* For Zephyr, keep max number of fd's in sync with max poll() capacity */
-#ifdef CONFIG_NET_SOCKETS_POLL_MAX
-#define NUM_FDS CONFIG_NET_SOCKETS_POLL_MAX
+#ifdef CONFIG_ZVFS_POLL_MAX
+#define NUM_FDS CONFIG_ZVFS_POLL_MAX
 #else
 #define NUM_FDS 5
 #endif
diff --git a/samples/net/sockets/echo_async_select/prj.conf b/samples/net/sockets/echo_async_select/prj.conf
index 278ef31e818..85f4ba5a0b1 100644
--- a/samples/net/sockets/echo_async_select/prj.conf
+++ b/samples/net/sockets/echo_async_select/prj.conf
@@ -9,7 +9,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=5
+CONFIG_ZVFS_POLL_MAX=5
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/net/sockets/echo_async_select/src/socket_echo_select.c b/samples/net/sockets/echo_async_select/src/socket_echo_select.c
index 9ae3511579b..6ff8a6d5255 100644
--- a/samples/net/sockets/echo_async_select/src/socket_echo_select.c
+++ b/samples/net/sockets/echo_async_select/src/socket_echo_select.c
@@ -36,8 +36,8 @@
 #endif
 
 /* For Zephyr, keep max number of fd's in sync with max poll() capacity */
-#ifdef CONFIG_NET_SOCKETS_POLL_MAX
-#define NUM_FDS CONFIG_NET_SOCKETS_POLL_MAX
+#ifdef CONFIG_ZVFS_POLL_MAX
+#define NUM_FDS CONFIG_ZVFS_POLL_MAX
 #else
 #define NUM_FDS 5
 #endif
diff --git a/samples/net/sockets/echo_client/prj.conf b/samples/net/sockets/echo_client/prj.conf
index 4193099fc96..434969a397d 100644
--- a/samples/net/sockets/echo_client/prj.conf
+++ b/samples/net/sockets/echo_client/prj.conf
@@ -5,7 +5,7 @@ CONFIG_NET_TCP=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=5
+CONFIG_ZVFS_POLL_MAX=5
 CONFIG_NET_CONNECTION_MANAGER=y
 
 CONFIG_POSIX_API=y
diff --git a/samples/net/sockets/echo_service/prj.conf b/samples/net/sockets/echo_service/prj.conf
index 3b12a238378..72cb9c21f05 100644
--- a/samples/net/sockets/echo_service/prj.conf
+++ b/samples/net/sockets/echo_service/prj.conf
@@ -13,8 +13,8 @@ CONFIG_NET_IPV4_MAPPING_TO_IPV6=y
 CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_NET_MAX_CONN=5
 CONFIG_NET_SOCKETS_SERVICE=y
-CONFIG_NET_SOCKETS_POLL_MAX=20
 CONFIG_ZVFS_OPEN_MAX=20
+CONFIG_ZVFS_POLL_MAX=20
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/net/sockets/http_client/prj.conf b/samples/net/sockets/http_client/prj.conf
index 985406f5b5d..6f0e8af7b63 100644
--- a/samples/net/sockets/http_client/prj.conf
+++ b/samples/net/sockets/http_client/prj.conf
@@ -11,7 +11,7 @@ CONFIG_NET_SHELL=y
 
 # Sockets
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 CONFIG_POSIX_API=y
 
 # Network driver config
diff --git a/samples/net/sockets/http_server/prj.conf b/samples/net/sockets/http_server/prj.conf
index 67fd6a2468c..aa04b93f223 100644
--- a/samples/net/sockets/http_server/prj.conf
+++ b/samples/net/sockets/http_server/prj.conf
@@ -9,7 +9,7 @@ CONFIG_INIT_STACKS=y
 CONFIG_ZVFS_OPEN_MAX=32
 CONFIG_POSIX_API=y
 CONFIG_FDTABLE=y
-CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_ZVFS_POLL_MAX=32
 
 # Eventfd
 CONFIG_EVENTFD=y
diff --git a/samples/net/sockets/sntp_client/prj.conf b/samples/net/sockets/sntp_client/prj.conf
index 56c9982fc59..12798c12cf3 100644
--- a/samples/net/sockets/sntp_client/prj.conf
+++ b/samples/net/sockets/sntp_client/prj.conf
@@ -11,7 +11,7 @@ CONFIG_NET_SHELL=y
 
 # Sockets
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/net/sockets/websocket_client/prj.conf b/samples/net/sockets/websocket_client/prj.conf
index 7b8a237fb68..e6a9e794860 100644
--- a/samples/net/sockets/websocket_client/prj.conf
+++ b/samples/net/sockets/websocket_client/prj.conf
@@ -8,7 +8,7 @@ CONFIG_NET_STATISTICS=y
 
 # Sockets
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/net/zperf/prj.conf b/samples/net/zperf/prj.conf
index fe6499cec7f..91d46d763f9 100644
--- a/samples/net/zperf/prj.conf
+++ b/samples/net/zperf/prj.conf
@@ -21,7 +21,7 @@ CONFIG_NET_MAX_CONTEXTS=5
 CONFIG_NET_TC_TX_COUNT=1
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=-1
-CONFIG_NET_SOCKETS_POLL_MAX=9
+CONFIG_ZVFS_POLL_MAX=9
 CONFIG_ZVFS_OPEN_MAX=12
 CONFIG_POSIX_API=y
 
diff --git a/subsys/net/lib/coap/coap_server.c b/subsys/net/lib/coap/coap_server.c
index b291ec8e861..8b7fc0168c3 100644
--- a/subsys/net/lib/coap/coap_server.c
+++ b/subsys/net/lib/coap/coap_server.c
@@ -33,9 +33,9 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #define MAX_OPTIONS    CONFIG_COAP_SERVER_MESSAGE_OPTIONS
 #define MAX_PENDINGS   CONFIG_COAP_SERVICE_PENDING_MESSAGES
 #define MAX_OBSERVERS  CONFIG_COAP_SERVICE_OBSERVERS
-#define MAX_POLL_FD    CONFIG_NET_SOCKETS_POLL_MAX
+#define MAX_POLL_FD    CONFIG_ZVFS_POLL_MAX
 
-BUILD_ASSERT(CONFIG_NET_SOCKETS_POLL_MAX > 0, "CONFIG_NET_SOCKETS_POLL_MAX can't be 0");
+BUILD_ASSERT(CONFIG_ZVFS_POLL_MAX > 0, "CONFIG_ZVFS_POLL_MAX can't be 0");
 
 static K_MUTEX_DEFINE(lock);
 static int control_socks[2];
@@ -760,7 +760,7 @@ static void coap_server_thread(void *p1, void *p2, void *p3)
 			}
 			if (sock_nfds >= MAX_POLL_FD) {
 				LOG_ERR("Maximum active CoAP services reached (%d), "
-					"increase CONFIG_NET_SOCKETS_POLL_MAX to support more.",
+					"increase CONFIG_ZVFS_POLL_MAX to support more.",
 					MAX_POLL_FD);
 				break;
 			}
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 833b72217f1..be61fc46bdb 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -96,7 +96,7 @@ static sys_slist_t engine_service_list;
 static K_KERNEL_STACK_DEFINE(engine_thread_stack, CONFIG_LWM2M_ENGINE_STACK_SIZE);
 static struct k_thread engine_thread_data;
 
-#define MAX_POLL_FD CONFIG_NET_SOCKETS_POLL_MAX
+#define MAX_POLL_FD CONFIG_ZVFS_POLL_MAX
 
 /* Resources */
 static struct zsock_pollfd sock_fds[MAX_POLL_FD];
diff --git a/subsys/net/lib/shell/sockets.c b/subsys/net/lib/shell/sockets.c
index 063f4dd23b1..f41e17329e5 100644
--- a/subsys/net/lib/shell/sockets.c
+++ b/subsys/net/lib/shell/sockets.c
@@ -96,7 +96,7 @@ static void walk_socket_services(const struct net_socket_service_desc *svc,
 	const struct shell *sh = data->sh;
 	int *count = data->user_data;
 	int len = 0;
-	static char pev_output[sizeof("xxx,") * CONFIG_NET_SOCKETS_POLL_MAX];
+	static char pev_output[sizeof("xxx,") * CONFIG_ZVFS_POLL_MAX];
 	static char owner[MAX_OWNER_LEN + 1];
 
 	NET_ASSERT(svc->pev != NULL);
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index 47192211fb8..63b9549bf51 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -48,13 +48,11 @@ config NET_SOCKETS_POSIX_NAMES
 	  with 3rd-party socket libraries.
 
 config NET_SOCKETS_POLL_MAX
-	int "Max number of supported poll() entries"
-	default 6 if WIFI_NM_WPA_SUPPLICANT
-	default 4 if SHELL_BACKEND_TELNET
-	default 3
-	range 1 ZVFS_OPEN_MAX
+	int "Max number of supported poll() entries [DEPRECATED]"
+	default 0
 	help
-	  Maximum number of entries supported for poll() call.
+	  This option is deprecated.
+	  Please use CONFIG_ZVFS_POLL_MAX instead.
 
 config NET_SOCKETS_CONNECT_TIMEOUT
 	int "Timeout value in milliseconds to CONNECT"
@@ -110,7 +108,7 @@ config NET_SOCKETS_SERVICE
 	  The socket service can monitor multiple sockets and save memory
 	  by only having one thread listening socket data. If data is received
 	  in the monitored socket, a user supplied work is called.
-	  Note that you need to set CONFIG_NET_SOCKETS_POLL_MAX high enough
+	  Note that you need to set CONFIG_ZVFS_POLL_MAX high enough
 	  so that enough sockets entries can be serviced. This depends on
 	  system needs as multiple services can be activated at the same time
 	  depending on network configuration.
diff --git a/subsys/net/lib/sockets/sockets_service.c b/subsys/net/lib/sockets/sockets_service.c
index ac367c34358..81d6d2e331e 100644
--- a/subsys/net/lib/sockets/sockets_service.c
+++ b/subsys/net/lib/sockets/sockets_service.c
@@ -29,7 +29,7 @@ STRUCT_SECTION_START_EXTERN(net_socket_service_desc);
 STRUCT_SECTION_END_EXTERN(net_socket_service_desc);
 
 static struct service {
-	struct zsock_pollfd events[CONFIG_NET_SOCKETS_POLL_MAX];
+	struct zsock_pollfd events[CONFIG_ZVFS_POLL_MAX];
 	int count;
 } ctx;
 
@@ -198,7 +198,7 @@ static void socket_service_thread(void)
 			"%zd poll entries configured.",
 			count + 1, ARRAY_SIZE(ctx.events));
 		NET_ERR("Please increase value of %s to at least %d",
-			"CONFIG_NET_SOCKETS_POLL_MAX", count + 1);
+			"CONFIG_ZVFS_POLL_MAX", count + 1);
 		goto fail;
 	}
 
diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c
index 4d190891377..57120321b3a 100644
--- a/subsys/net/lib/sockets/sockets_tls.c
+++ b/subsys/net/lib/sockets/sockets_tls.c
@@ -3310,7 +3310,7 @@ static bool poll_offload_dtls_client_retry(struct tls_context *ctx,
 
 static int ztls_poll_offload(struct zsock_pollfd *fds, int nfds, int timeout)
 {
-	int fd_backup[CONFIG_NET_SOCKETS_POLL_MAX];
+	int fd_backup[CONFIG_ZVFS_POLL_MAX];
 	const struct fd_op_vtable *vtable;
 	void *ctx;
 	int ret = 0;
diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c
index c2dcba9eac3..3729cb3c9df 100644
--- a/subsys/net/lib/websocket/websocket.c
+++ b/subsys/net/lib/websocket/websocket.c
@@ -458,7 +458,7 @@ static int websocket_close_vmeth(void *obj)
 static inline int websocket_poll_offload(struct zsock_pollfd *fds, int nfds,
 					 int timeout)
 {
-	int fd_backup[CONFIG_NET_SOCKETS_POLL_MAX];
+	int fd_backup[CONFIG_ZVFS_POLL_MAX];
 	const struct fd_op_vtable *vtable;
 	void *ctx;
 	int ret = 0;
diff --git a/tests/bsim/net/sockets/echo_test/prj.conf b/tests/bsim/net/sockets/echo_test/prj.conf
index 259caa0deb5..a1e13d1cf22 100644
--- a/tests/bsim/net/sockets/echo_test/prj.conf
+++ b/tests/bsim/net/sockets/echo_test/prj.conf
@@ -7,7 +7,7 @@ CONFIG_NET_TCP=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
 CONFIG_NET_CONNECTION_MANAGER=y
 
 CONFIG_POSIX_API=y
diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf
index f4f42f78187..fd5d1b78c64 100644
--- a/tests/net/all/prj.conf
+++ b/tests/net/all/prj.conf
@@ -353,8 +353,8 @@ CONFIG_NET_SOCKETS_ENABLE_DTLS=y
 CONFIG_NET_SOCKETS_LOG_LEVEL_DBG=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
 CONFIG_NET_SOCKETS_PACKET=y
-CONFIG_NET_SOCKETS_POLL_MAX=50
 CONFIG_ZVFS_OPEN_MAX=50
+CONFIG_ZVFS_POLL_MAX=50
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 CONFIG_NET_SOCKETS_TLS_MAX_CIPHERSUITES=10
diff --git a/tests/net/lib/coap_client/CMakeLists.txt b/tests/net/lib/coap_client/CMakeLists.txt
index e12214fc6a9..0987064ef3b 100644
--- a/tests/net/lib/coap_client/CMakeLists.txt
+++ b/tests/net/lib/coap_client/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/)
 
 target_compile_definitions(app PRIVATE _POSIX_C_SOURCE=200809L)
 
-add_compile_definitions(CONFIG_NET_SOCKETS_POLL_MAX=3)
+add_compile_definitions(CONFIG_ZVFS_POLL_MAX=3)
 add_compile_definitions(CONFIG_COAP_CLIENT=y)
 add_compile_definitions(CONFIG_COAP_CLIENT_BLOCK_SIZE=256)
 add_compile_definitions(CONFIG_COAP_CLIENT_MESSAGE_SIZE=256)
diff --git a/tests/net/lib/dns_addremove/prj.conf b/tests/net/lib/dns_addremove/prj.conf
index 81c65b34f32..112794a03da 100644
--- a/tests/net/lib/dns_addremove/prj.conf
+++ b/tests/net/lib/dns_addremove/prj.conf
@@ -17,5 +17,5 @@ CONFIG_NET_ARP=n
 CONFIG_PRINTK=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_NET_SOCKETS_POLL_MAX=5
 CONFIG_ZVFS_OPEN_MAX=5
+CONFIG_ZVFS_POLL_MAX=5
diff --git a/tests/net/lib/dns_resolve/prj.conf b/tests/net/lib/dns_resolve/prj.conf
index e90e185040a..21fafa85cda 100644
--- a/tests/net/lib/dns_resolve/prj.conf
+++ b/tests/net/lib/dns_resolve/prj.conf
@@ -29,5 +29,5 @@ CONFIG_PRINTK=y
 CONFIG_ZTEST=y
 
 CONFIG_MAIN_STACK_SIZE=1344
-CONFIG_NET_SOCKETS_POLL_MAX=9
 CONFIG_ZVFS_OPEN_MAX=9
+CONFIG_ZVFS_POLL_MAX=9
diff --git a/tests/net/lib/dns_sd/prj.conf b/tests/net/lib/dns_sd/prj.conf
index e9f24acf88a..ab8deb9d58a 100644
--- a/tests/net/lib/dns_sd/prj.conf
+++ b/tests/net/lib/dns_sd/prj.conf
@@ -21,4 +21,4 @@ CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_NET_MAX_CONTEXTS=8
-CONFIG_NET_SOCKETS_POLL_MAX=4
+CONFIG_ZVFS_POLL_MAX=4
diff --git a/tests/net/lib/http_server/core/prj.conf b/tests/net/lib/http_server/core/prj.conf
index c5f7b412ffa..dc035db727d 100644
--- a/tests/net/lib/http_server/core/prj.conf
+++ b/tests/net/lib/http_server/core/prj.conf
@@ -22,7 +22,7 @@ CONFIG_NET_SOCKETS=y
 CONFIG_NET_LOOPBACK=y
 CONFIG_NET_LOOPBACK_MTU=1280
 CONFIG_NET_DRIVERS=y
-CONFIG_NET_SOCKETS_POLL_MAX=8
+CONFIG_ZVFS_POLL_MAX=8
 CONFIG_NET_BUF_RX_COUNT=32
 CONFIG_NET_BUF_TX_COUNT=32
 CONFIG_NET_PKT_RX_COUNT=16
diff --git a/tests/net/lib/http_server/crime/prj.conf b/tests/net/lib/http_server/crime/prj.conf
index 3ade5d7a2c7..910b89a4c04 100644
--- a/tests/net/lib/http_server/crime/prj.conf
+++ b/tests/net/lib/http_server/crime/prj.conf
@@ -24,7 +24,7 @@ CONFIG_NET_SOCKETS=y
 CONFIG_NET_LOOPBACK=y
 CONFIG_NET_LOOPBACK_MTU=1280
 CONFIG_NET_DRIVERS=y
-CONFIG_NET_SOCKETS_POLL_MAX=8
+CONFIG_ZVFS_POLL_MAX=8
 CONFIG_NET_BUF_RX_COUNT=32
 CONFIG_NET_BUF_TX_COUNT=32
 CONFIG_NET_PKT_RX_COUNT=16
diff --git a/tests/net/lib/http_server/tls/prj.conf b/tests/net/lib/http_server/tls/prj.conf
index 39eb867daeb..ecc95780d15 100644
--- a/tests/net/lib/http_server/tls/prj.conf
+++ b/tests/net/lib/http_server/tls/prj.conf
@@ -38,7 +38,7 @@ CONFIG_NET_BUF_RX_COUNT=32
 CONFIG_NET_PKT_TX_COUNT=16
 CONFIG_NET_PKT_RX_COUNT=16
 CONFIG_ZVFS_OPEN_MAX=32
-CONFIG_NET_SOCKETS_POLL_MAX=32
+CONFIG_ZVFS_POLL_MAX=32
 CONFIG_ZVFS_OPEN_MAX=32
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_ZVFS_EVENTFD_MAX=10
diff --git a/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt b/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt
index d4a60e2bb9c..2538d32a4cd 100644
--- a/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt
+++ b/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt
@@ -32,7 +32,7 @@ add_compile_definitions(CONFIG_LWM2M_SECURITY_INSTANCE_COUNT=1)
 add_compile_definitions(CONFIG_LWM2M_SECONDS_TO_UPDATE_EARLY=30)
 add_compile_definitions(CONFIG_LWM2M_QUEUE_MODE_UPTIME=30)
 add_compile_definitions(CONFIG_LWM2M_LOG_LEVEL=4)
-add_compile_definitions(CONFIG_NET_SOCKETS_POLL_MAX=3)
+add_compile_definitions(CONFIG_ZVFS_POLL_MAX=3)
 add_compile_definitions(CONFIG_LWM2M_DTLS_SUPPORT)
 add_compile_definitions(CONFIG_LWM2M_QUEUE_MODE_ENABLED)
 add_compile_definitions(CONFIG_TLS_CREDENTIALS)
diff --git a/tests/net/lib/mdns_responder/prj.conf b/tests/net/lib/mdns_responder/prj.conf
index 9ea50969898..ecd170c5e51 100644
--- a/tests/net/lib/mdns_responder/prj.conf
+++ b/tests/net/lib/mdns_responder/prj.conf
@@ -5,8 +5,8 @@ CONFIG_NET_DRIVERS=y
 CONFIG_NET_LOOPBACK=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
-CONFIG_NET_SOCKETS_POLL_MAX=7
 CONFIG_ZVFS_OPEN_MAX=7
+CONFIG_ZVFS_POLL_MAX=7
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/socket/service/prj.conf b/tests/net/socket/service/prj.conf
index d0664554f7f..151b79e8530 100644
--- a/tests/net/socket/service/prj.conf
+++ b/tests/net/socket/service/prj.conf
@@ -10,7 +10,7 @@ CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_PKT_RX_COUNT=8
 CONFIG_NET_MAX_CONN=5
 CONFIG_NET_SOCKETS_SERVICE=y
-CONFIG_NET_SOCKETS_POLL_MAX=20
+CONFIG_ZVFS_POLL_MAX=20
 
 # We need to set POSIX_API and use picolibc for eventfd to work
 CONFIG_POSIX_API=y