diff --git a/cmake/linker_script/common/common-ram.cmake b/cmake/linker_script/common/common-ram.cmake
index 091da6ff5411..48e0c6010aa8 100644
--- a/cmake/linker_script/common/common-ram.cmake
+++ b/cmake/linker_script/common/common-ram.cmake
@@ -18,10 +18,10 @@ zephyr_linker_section_configure(SECTION device_states
 )
 
 if(CONFIG_PM_DEVICE)
-  zephyr_iterable_section(NAME pm_device_slots GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME pm_device_slots GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_USERSPACE)
   # All kernel objects within are assumed to be either completely
@@ -32,35 +32,35 @@ if(CONFIG_USERSPACE)
   #   _static_kernel_objects_begin = .;
 endif()
 
-zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_NETWORKING)
-  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ARM_SCMI)
-  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_DEVICE_STACK)
@@ -83,8 +83,8 @@ if(CONFIG_USB_DEVICE_BOS)
 endif()
 
 if(CONFIG_RTIO)
-  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 #if(CONFIG_USERSPACE)
@@ -93,11 +93,11 @@ endif()
 #
 
 if(CONFIG_ZTEST)
-  zephyr_iterable_section(NAME ztest_suite_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_suite_stats GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_unit_test GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_test_rule GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME ztest_expected_result_entry GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ztest_suite_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_suite_stats GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_unit_test GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_test_rule GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME ztest_expected_result_entry GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ZBUS)
@@ -105,31 +105,31 @@ if(CONFIG_ZBUS)
 endif()
 
 if(CONFIG_UVB)
-  zephyr_iterable_section(NAME uvb_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME uvb_node GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 
 if(CONFIG_LOG)
-  zephyr_iterable_section(NAME log_mpsc_pbuf GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME log_msg_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME log_mpsc_pbuf GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME log_msg_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_PCIE)
-  zephyr_iterable_section(NAME pcie_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME pcie_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_DEVICE_STACK OR CONFIG_USB_DEVICE_STACK_NEXT)
-  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbd_context GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbd_class_fs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbd_class_hs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_context GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_class_fs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbd_class_hs GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_HOST_STACK)
-  zephyr_iterable_section(NAME usbh_contex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME usbh_class_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbh_contex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usbh_class_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_DEVICE_MUTABLE)
-  zephyr_iterable_section(NAME device_mutable GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME device_mutable GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
diff --git a/cmake/linker_script/common/common-rom.cmake b/cmake/linker_script/common/common-rom.cmake
index 2fd4fcedb470..868e9f382d93 100644
--- a/cmake/linker_script/common/common-rom.cmake
+++ b/cmake/linker_script/common/common-rom.cmake
@@ -11,7 +11,7 @@ zephyr_linker_section_obj_level(SECTION init LEVEL SMP)
 zephyr_linker_section(NAME deferred_init_list KVMA RAM_REGION GROUP RODATA_REGION)
 zephyr_linker_section_configure(SECTION deferred_init_list INPUT ".z_deferred_init*" KEEP SORT NAME)
 
-zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_GEN_SW_ISR_TABLE AND NOT CONFIG_DYNAMIC_INTERRUPTS)
   # ld align has been changed to subalign to provide identical behavior scatter vs. ld.
@@ -92,98 +92,98 @@ zephyr_linker_section_configure(
 )
 
 if(CONFIG_NET_SOCKETS)
-  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 
 if(CONFIG_NET_L2_PPP)
-  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_BT_CLASSIC)
-  zephyr_iterable_section(NAME bt_l2cap_br_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_l2cap_br_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_CONN)
-  zephyr_iterable_section(NAME bt_conn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_conn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME bt_gatt_service_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME bt_gatt_service_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_BT_MESH)
-  zephyr_iterable_section(NAME bt_mesh_subnet_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME bt_mesh_app_key_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_subnet_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME bt_mesh_app_key_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-  zephyr_iterable_section(NAME bt_mesh_hb_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_hb_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_MESH_FRIEND)
-  zephyr_iterable_section(NAME bt_mesh_friend_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_friend_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_MESH_LOW_POWER)
-  zephyr_iterable_section(NAME bt_mesh_lpn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_lpn_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_BT_MESH_PROXY)
-  zephyr_iterable_section(NAME bt_mesh_proxy_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_mesh_proxy_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_EC_HOST_CMD)
-  zephyr_iterable_section(NAME ec_host_cmd_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME ec_host_cmd_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SETTINGS)
-  zephyr_iterable_section(NAME settings_handler_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME settings_handler_static KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensing_sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSOR_INFO)
-  zephyr_iterable_section(NAME sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensor_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSOR_ASYNC_API)
-  zephyr_iterable_section(NAME sensor_decoder_api KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME sensor_decoder_api KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_MCUMGR)
-  zephyr_iterable_section(NAME mcumgr_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME mcumgr_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME k_p4wq_initparam KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME k_p4wq_initparam KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_EMUL)
-  zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_DNS_SD)
-  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_PCIE)
-  zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME shell_dynamic_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME shell_dynamic_subcmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
-zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 zephyr_linker_section(NAME zephyr_dbg_info KVMA RAM_REGION GROUP RODATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT})
 zephyr_linker_section_configure(SECTION zephyr_dbg_info INPUT ".zephyr_dbg_info" KEEP)
@@ -199,15 +199,15 @@ if (CONFIG_DEVICE_DEPS)
   zephyr_linker_section_configure(SECTION device_deps INPUT .__device_deps_pass2* KEEP SORT NAME PASS NOT LINKER_DEVICE_DEPS_PASS1)
 endif()
 
-zephyr_iterable_section(NAME _static_thread_data KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME _static_thread_data KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if (CONFIG_BT_IAS)
-  zephyr_iterable_section(NAME bt_ias_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME bt_ias_cb KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_LOG)
-  zephyr_iterable_section(NAME log_link KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME log_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME log_link KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME log_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_MULTI_LEVEL_INTERRUPTS)
@@ -215,35 +215,35 @@ if (CONFIG_MULTI_LEVEL_INTERRUPTS)
 endif()
 
 if (CONFIG_HTTP_SERVER)
-  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_COAP_SERVER)
-  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if (CONFIG_NET_MGMT)
-  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_INPUT)
-  zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USBD_MSC_CLASS)
-  zephyr_iterable_section(NAME usbd_msc_lun KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME usbd_msc_lun KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ZBUS)
-  zephyr_iterable_section(NAME zbus_channel KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME zbus_observer KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-  zephyr_iterable_section(NAME zbus_channel_observation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME zbus_channel KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME zbus_observer KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME zbus_channel_observation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_GNSS)
-  zephyr_iterable_section(NAME gnss_data_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME gnss_data_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_GNSS_SATELLITES)
-  zephyr_iterable_section(NAME gnss_satellites_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  zephyr_iterable_section(NAME gnss_satellites_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
diff --git a/samples/net/common/common.cmake b/samples/net/common/common.cmake
index b17d6493819a..c0e0e5111794 100644
--- a/samples/net/common/common.cmake
+++ b/samples/net/common/common.cmake
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Common routines used in net samples
+
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/samples/net/common/)
+target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/net/common/net_sample_common.c)
diff --git a/samples/net/common/net_sample_common.c b/samples/net/common/net_sample_common.c
new file mode 100644
index 000000000000..1e744f178b51
--- /dev/null
+++ b/samples/net/common/net_sample_common.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(net_samples_common, LOG_LEVEL_DBG);
+
+#include <zephyr/net/conn_mgr_connectivity.h>
+
+#if defined(CONFIG_NET_CONNECTION_MANAGER)
+#define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
+
+static struct net_mgmt_event_callback l4_cb;
+static K_SEM_DEFINE(network_connected, 0, 1);
+
+static void l4_event_handler(struct net_mgmt_event_callback *cb, uint32_t event,
+			     struct net_if *iface)
+{
+	switch (event) {
+	case NET_EVENT_L4_CONNECTED:
+		LOG_INF("Network connectivity established and IP address assigned");
+		k_sem_give(&network_connected);
+		break;
+	case NET_EVENT_L4_DISCONNECTED:
+		break;
+	default:
+		break;
+	}
+}
+
+void wait_for_network(void)
+{
+	net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
+	net_mgmt_add_event_callback(&l4_cb);
+
+	LOG_INF("Waiting for network...");
+
+	k_sem_take(&network_connected, K_FOREVER);
+}
+#endif /* CONFIG_NET_CONNECTION_MANAGER */
diff --git a/samples/net/common/net_sample_common.h b/samples/net/common/net_sample_common.h
new file mode 100644
index 000000000000..f44e852a0da3
--- /dev/null
+++ b/samples/net/common/net_sample_common.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if defined(CONFIG_NET_CONNECTION_MANAGER)
+void wait_for_network(void);
+#else
+static inline void wait_for_network(void) { }
+#endif /* CONFIG_NET_CONNECTION_MANAGER */
diff --git a/samples/net/dhcpv4_client/overlay-nrf700x.conf b/samples/net/dhcpv4_client/overlay-nrf700x.conf
deleted file mode 100644
index 2d552e9c6231..000000000000
--- a/samples/net/dhcpv4_client/overlay-nrf700x.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/dns_resolve/CMakeLists.txt b/samples/net/dns_resolve/CMakeLists.txt
index 1ac07c37fd2e..1a8633882643 100644
--- a/samples/net/dns_resolve/CMakeLists.txt
+++ b/samples/net/dns_resolve/CMakeLists.txt
@@ -6,3 +6,5 @@ project(dns_resolve)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/dns_resolve/Kconfig.sysbuild b/samples/net/dns_resolve/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/dns_resolve/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/dns_resolve/README.rst b/samples/net/dns_resolve/README.rst
index e566fa44bd14..b741b827ac92 100644
--- a/samples/net/dns_resolve/README.rst
+++ b/samples/net/dns_resolve/README.rst
@@ -155,3 +155,9 @@ Open a terminal window and type:
 Use 'dmesg' to find the right USB device.
 
 Once the binary is loaded into the FRDM board, press the RESET button.
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/dns_resolve/overlay-nrf700x.conf b/samples/net/dns_resolve/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/dns_resolve/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/dns_resolve/sample.yaml b/samples/net/dns_resolve/sample.yaml
index cafc9beac83f..7cf510d0ba43 100644
--- a/samples/net/dns_resolve/sample.yaml
+++ b/samples/net/dns_resolve/sample.yaml
@@ -23,3 +23,9 @@ tests:
       - CONFIG_LLMNR_RESOLVER=y
       - CONFIG_NET_DHCPV4=y
     tags: llmnr
+  sample.net.dns_resolve.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c
index 5eec113ead3e..23e5645d0b45 100644
--- a/samples/net/dns_resolve/src/main.c
+++ b/samples/net/dns_resolve/src/main.c
@@ -17,6 +17,8 @@ LOG_MODULE_REGISTER(net_dns_resolve_client_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_mgmt.h>
 #include <zephyr/net/dns_resolve.h>
 
+#include "net_sample_common.h"
+
 #if defined(CONFIG_MDNS_RESOLVER)
 #if defined(CONFIG_NET_IPV4)
 static struct k_work_delayable mdns_ipv4_timer;
@@ -395,6 +397,8 @@ int main(void)
 
 	LOG_INF("Starting DNS resolve sample");
 
+	wait_for_network();
+
 	setup_ipv4(iface);
 
 	setup_dhcpv4(iface);
diff --git a/samples/net/gptp/boards/native_posix.conf b/samples/net/gptp/boards/native_posix.conf
deleted file mode 100644
index c514520186c2..000000000000
--- a/samples/net/gptp/boards/native_posix.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
-
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
-
-# Assume 1 ms accuracy for native_posix simulated clock
-CONFIG_NET_GPTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/gptp/sample.yaml b/samples/net/gptp/sample.yaml
index 44bf695d628d..c2698bae1aa2 100644
--- a/samples/net/gptp/sample.yaml
+++ b/samples/net/gptp/sample.yaml
@@ -11,8 +11,6 @@ tests:
     platform_allow:
       - frdm_k64f
       - sam_e70_xplained/same70q21
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
       - nucleo_f767zi
diff --git a/samples/net/ipv4_autoconf/CMakeLists.txt b/samples/net/ipv4_autoconf/CMakeLists.txt
index cb0f8e1b9c67..8bcf3bfd244d 100644
--- a/samples/net/ipv4_autoconf/CMakeLists.txt
+++ b/samples/net/ipv4_autoconf/CMakeLists.txt
@@ -6,3 +6,5 @@ project(ipv4_autoconf)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/ipv4_autoconf/Kconfig.sysbuild b/samples/net/ipv4_autoconf/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/ipv4_autoconf/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/ipv4_autoconf/README.rst b/samples/net/ipv4_autoconf/README.rst
index 614f2c640479..f9a8f63363bd 100644
--- a/samples/net/ipv4_autoconf/README.rst
+++ b/samples/net/ipv4_autoconf/README.rst
@@ -69,3 +69,9 @@ type:
 .. code-block:: console
 
    $ ping -I eth1 169.254.218.128
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/ipv4_autoconf/overlay-nrf700x.conf b/samples/net/ipv4_autoconf/overlay-nrf700x.conf
deleted file mode 100644
index 2d552e9c6231..000000000000
--- a/samples/net/ipv4_autoconf/overlay-nrf700x.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/ipv4_autoconf/sample.yaml b/samples/net/ipv4_autoconf/sample.yaml
index 0322a31ad75e..eb9c06ae18e9 100644
--- a/samples/net/ipv4_autoconf/sample.yaml
+++ b/samples/net/ipv4_autoconf/sample.yaml
@@ -1,19 +1,23 @@
 common:
   harness: net
+  depends_on: netif
   tags:
     - net
     - ipv4_autoconf
-  platform_allow:
-    - qemu_x86
-    - native_posix
-    - native_posix/native/64
-    - native_sim
-    - native_sim/native/64
-  integration_platforms:
-    - native_sim
 sample:
   description: Test IPv4 autoconf functionality
   name: IPv4 autoconf sample app
 tests:
   sample.net.ipv4_autoconf:
-    depends_on: netif
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+  sample.net.ipv4_autoconf.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c
index b9f9c00379df..c4e93105cf73 100644
--- a/samples/net/ipv4_autoconf/src/main.c
+++ b/samples/net/ipv4_autoconf/src/main.c
@@ -20,6 +20,8 @@ LOG_MODULE_REGISTER(net_ipv4_autoconf_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_context.h>
 #include <zephyr/net/net_mgmt.h>
 
+#include "net_sample_common.h"
+
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void handler(struct net_mgmt_event_callback *cb,
@@ -60,6 +62,8 @@ int main(void)
 {
 	LOG_INF("Run ipv4 autoconf client");
 
+	wait_for_network();
+
 	net_mgmt_init_event_callback(&mgmt_cb, handler,
 				     NET_EVENT_IPV4_ADDR_ADD);
 	net_mgmt_add_event_callback(&mgmt_cb);
diff --git a/samples/net/lldp/sample.yaml b/samples/net/lldp/sample.yaml
index ee465be7883c..27f26d18590c 100644
--- a/samples/net/lldp/sample.yaml
+++ b/samples/net/lldp/sample.yaml
@@ -9,8 +9,6 @@ sample:
 tests:
   sample.net.lldp:
     platform_allow:
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
     integration_platforms:
diff --git a/samples/net/lwm2m_client/Kconfig b/samples/net/lwm2m_client/Kconfig
index 2037d281ce0c..1bc4b6c49b00 100644
--- a/samples/net/lwm2m_client/Kconfig
+++ b/samples/net/lwm2m_client/Kconfig
@@ -29,6 +29,8 @@ endif
 
 config LWM2M_APP_SERVER
 	string "LwM2M server address"
+	default "coap://leshan.eclipseprojects.io:5683" if (WIFI && !LWM2M_DTLS_SUPPORT)
+	default "coaps://leshan.eclipseprojects.io:5684" if (WIFI && LWM2M_DTLS_SUPPORT)
 	default "coap://192.0.2.2:5683" if !LWM2M_DTLS_SUPPORT
 	default "coaps://192.0.2.2:5684" if (LWM2M_DTLS_SUPPORT && !LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
 	default "coaps://192.0.2.2:5784" if (LWM2M_DTLS_SUPPORT && LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
diff --git a/samples/net/lwm2m_client/Kconfig.sysbuild b/samples/net/lwm2m_client/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/lwm2m_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/lwm2m_client/overlay-nrf700x.conf b/samples/net/lwm2m_client/overlay-nrf700x.conf
deleted file mode 100644
index 2409886fe420..000000000000
--- a/samples/net/lwm2m_client/overlay-nrf700x.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-# General
-CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_ENTROPY_GENERATOR=y
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WIFI_MGMT_EXT=y
-CONFIG_NRF_WIFI_IF_AUTO_START=n
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
-
-# WPA
-CONFIG_WPA_SUPP=y
-CONFIG_WPA_SUPP_LOG_LEVEL_ERR=y
-
-CONFIG_NET_NATIVE=y
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_NET_UDP=y
-CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_OFFLOAD=n
-CONFIG_NET_BUF_RX_COUNT=18
-CONFIG_NET_BUF_TX_COUNT=18
-CONFIG_NET_DEFAULT_IF_WIFI=y
-
-# DNS
-CONFIG_DNS_RESOLVER=y
-
-# DHCPv4
-CONFIG_NET_DHCPV4=y
-CONFIG_NET_CONFIG_AUTO_INIT=n
-CONFIG_NET_CONFIG_NEED_IPV6=n
-CONFIG_NET_CONFIG_NEED_IPV4=n
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Zephyr NET Connection Manager Connectivity layer.
-CONFIG_L2_WIFI_CONNECTIVITY=y
-CONFIG_L2_WIFI_CONNECTIVITY_AUTO_DOWN=n
-CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n
-
-CONFIG_LWM2M_APP_ID="nrf700x"
-CONFIG_LWM2M_APP_SERVER="coaps://leshan.eclipseprojects.io:5684"
-CONFIG_LWM2M_DNS_SUPPORT=y
-
-# Enable DTLS support
-CONFIG_LWM2M_DTLS_SUPPORT=y
-CONFIG_LWM2M_TLS_SESSION_CACHING=y
-
-# TLS networking
-CONFIG_NET_SOCKETS_ENABLE_DTLS=y
-CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=4
-CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
-
-# nRF Security
-CONFIG_NRF_SECURITY=y
-
-# mbedTLS
-CONFIG_MBEDTLS=y
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=120000
-CONFIG_MBEDTLS_RSA_C=y
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index cea4f92ce8c1..e59b4e9482a3 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -385,12 +385,9 @@ int main(void)
 			return ret;
 		}
 
-		ret = conn_mgr_if_connect(net_if_get_default());
-		/* Ignore errors from interfaces not requiring connectivity */
-		if (ret == 0) {
-			LOG_INF("Connecting to network");
-			k_sem_take(&network_connected_sem, K_FOREVER);
-		}
+		(void)conn_mgr_if_connect(net_if_get_default());
+
+		k_sem_take(&network_connected_sem, K_FOREVER);
 	}
 
 	ret = lwm2m_setup();
diff --git a/samples/net/mdns_responder/Kconfig.sysbuild b/samples/net/mdns_responder/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/mdns_responder/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mdns_responder/README.rst b/samples/net/mdns_responder/README.rst
index 015f6c8b4444..bdb652592822 100644
--- a/samples/net/mdns_responder/README.rst
+++ b/samples/net/mdns_responder/README.rst
@@ -74,3 +74,9 @@ If the query is successful, then the following information is printed:
        address = [192.0.2.1]
        port = [4242]
        txt = []
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/mdns_responder/overlay-nrf700x.conf b/samples/net/mdns_responder/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/mdns_responder/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/mdns_responder/sample.yaml b/samples/net/mdns_responder/sample.yaml
index dff79845d751..31b12260d0f9 100644
--- a/samples/net/mdns_responder/sample.yaml
+++ b/samples/net/mdns_responder/sample.yaml
@@ -1,13 +1,20 @@
+common:
+  harness: net
+  tags:
+    - net
+    - mdns
 sample:
   name: mDNS responder
 tests:
   sample.net.mdns_responder:
-    harness: net
     platform_allow:
       - qemu_x86
       - qemu_cortex_m3
     integration_platforms:
       - qemu_x86
-    tags:
-      - net
-      - mdns
+  sample.net.mdns_responder.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/mdns_responder/src/main.c b/samples/net/mdns_responder/src/main.c
index 112f9e939316..d6eea7c8337d 100644
--- a/samples/net/mdns_responder/src/main.c
+++ b/samples/net/mdns_responder/src/main.c
@@ -12,6 +12,8 @@ LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG);
 #include <zephyr/kernel.h>
 #include <zephyr/net/net_core.h>
 
+#include "net_sample_common.h"
+
 extern void service(void);
 
 #if defined(CONFIG_NET_VLAN)
@@ -34,6 +36,8 @@ static inline int init_vlan(void)
  */
 int main(void)
 {
+	wait_for_network();
+
 	LOG_INF("Waiting mDNS queries...");
 	init_vlan();
 	service();
diff --git a/samples/net/mqtt_publisher/CMakeLists.txt b/samples/net/mqtt_publisher/CMakeLists.txt
index 4c6e3c0ef0cf..df6501079059 100644
--- a/samples/net/mqtt_publisher/CMakeLists.txt
+++ b/samples/net/mqtt_publisher/CMakeLists.txt
@@ -7,3 +7,5 @@ project(mqtt_publisher)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/mqtt_publisher/Kconfig.sysbuild b/samples/net/mqtt_publisher/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/mqtt_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_publisher/README.rst b/samples/net/mqtt_publisher/README.rst
index 6c75f2f2d7ea..081d3a326259 100644
--- a/samples/net/mqtt_publisher/README.rst
+++ b/samples/net/mqtt_publisher/README.rst
@@ -372,3 +372,9 @@ This is the output from the MQTT broker:
 	1485663807: Received PUBREL from zephyr_publisher (Mid: 49829)
 	1485663807: Sending PUBCOMP to zephyr_publisher (Mid: 49829)
 	1485663808: Received DISCONNECT from zephyr_publisher
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/mqtt_publisher/overlay-nrf700x.conf b/samples/net/mqtt_publisher/overlay-nrf700x.conf
deleted file mode 100644
index a812c7896f62..000000000000
--- a/samples/net/mqtt_publisher/overlay-nrf700x.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_CONFIG_NEED_IPV4=y
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/mqtt_publisher/sample.yaml b/samples/net/mqtt_publisher/sample.yaml
index 5d29a7e46a85..8d3662fe0bf0 100644
--- a/samples/net/mqtt_publisher/sample.yaml
+++ b/samples/net/mqtt_publisher/sample.yaml
@@ -28,3 +28,9 @@ tests:
       - net
       - mqtt
       - bluetooth
+  sample.net.mqtt_publisher.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index 231c9c2b2f36..faa96e33b5c0 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 #include <errno.h>
 
 #include "config.h"
+#include "net_sample_common.h"
 
 #if defined(CONFIG_USERSPACE)
 #include <zephyr/app_memory/app_memdomain.h>
@@ -516,6 +517,8 @@ static K_HEAP_DEFINE(app_mem_pool, 1024 * 2);
 
 int main(void)
 {
+	wait_for_network();
+
 #if defined(CONFIG_MQTT_LIB_TLS)
 	int rc;
 
diff --git a/samples/net/mqtt_sn_publisher/Kconfig.sysbuild b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_sn_publisher/overlay-nrf700x.conf b/samples/net/mqtt_sn_publisher/overlay-nrf700x.conf
deleted file mode 100644
index cbc47b965727..000000000000
--- a/samples/net/mqtt_sn_publisher/overlay-nrf700x.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_POSIX_MAX_FDS=16
-
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/coap_client/overlay-nrf700x.conf b/samples/net/sockets/coap_client/overlay-nrf700x.conf
deleted file mode 100644
index a0e436e3537d..000000000000
--- a/samples/net/sockets/coap_client/overlay-nrf700x.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=153000
-
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/coap_server/CMakeLists.txt b/samples/net/sockets/coap_server/CMakeLists.txt
index 932e3cfdeebe..5b9a0beeb197 100644
--- a/samples/net/sockets/coap_server/CMakeLists.txt
+++ b/samples/net/sockets/coap_server/CMakeLists.txt
@@ -15,4 +15,6 @@ zephyr_linker_sources(DATA_SECTIONS sections-ram.ld)
 zephyr_iterable_section(
   NAME coap_resource_coap_server
   GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT}
-  SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+  SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/coap_server/Kconfig.sysbuild b/samples/net/sockets/coap_server/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/sockets/coap_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/coap_server/README.rst b/samples/net/sockets/coap_server/README.rst
index 9aadbea5fc50..64bb1a687dcc 100644
--- a/samples/net/sockets/coap_server/README.rst
+++ b/samples/net/sockets/coap_server/README.rst
@@ -60,3 +60,9 @@ prj_cc2520.conf configuration file enabling IEEE 802.15.4.
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
 
 .. _`libcoap`: https://github.com/obgm/libcoap
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/sockets/coap_server/overlay-nrf700x.conf b/samples/net/sockets/coap_server/overlay-nrf700x.conf
deleted file mode 100644
index 4817a4f73ba6..000000000000
--- a/samples/net/sockets/coap_server/overlay-nrf700x.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=153000
-
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# The sample can run either IPv4 or IPv6, not both
-CONFIG_NET_IPV6=n
-CONFIG_NET_CONFIG_NEED_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_CONFIG_NEED_IPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/coap_server/prj.conf b/samples/net/sockets/coap_server/prj.conf
index 470caa6b4483..94ac1abd5cf5 100644
--- a/samples/net/sockets/coap_server/prj.conf
+++ b/samples/net/sockets/coap_server/prj.conf
@@ -13,6 +13,8 @@ CONFIG_COAP=y
 CONFIG_COAP_SERVER=y
 CONFIG_COAP_SERVER_WELL_KNOWN_CORE=y
 CONFIG_COAP_WELL_KNOWN_BLOCK_WISE=n
+CONFIG_COAP_EXTENDED_OPTIONS_LEN=y
+CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=40
 
 # Kernel options
 CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/net/sockets/coap_server/sample.yaml b/samples/net/sockets/coap_server/sample.yaml
index 2fcf9b632871..9f7d5de78d76 100644
--- a/samples/net/sockets/coap_server/sample.yaml
+++ b/samples/net/sockets/coap_server/sample.yaml
@@ -1,14 +1,20 @@
 common:
+  harness: net
+  tags:
+    - net
+    - socket
   filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 sample:
   description: BSD Sockets API CoAP server example
   name: socket_coap_server
 tests:
   sample.net.sockets.coap_server:
-    harness: net
-    tags:
-      - net
-      - socket
     platform_allow:
       - native_sim
       - qemu_x86
+  sample.net.sockets.coap_server.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/coap_server/src/main.c b/samples/net/sockets/coap_server/src/main.c
index 60dd32a000ba..19890c1f3d30 100644
--- a/samples/net/sockets/coap_server/src/main.c
+++ b/samples/net/sockets/coap_server/src/main.c
@@ -15,6 +15,8 @@ LOG_MODULE_REGISTER(net_coap_service_sample, LOG_LEVEL_DBG);
 #include "ipv6.h"
 #endif
 
+#include "net_sample_common.h"
+
 static const uint16_t coap_port = 5683;
 
 #ifdef CONFIG_NET_IPV6
@@ -71,6 +73,8 @@ static int join_coap_multicast_group(void)
 
 int main(void)
 {
+	wait_for_network();
+
 	return join_coap_multicast_group();
 }
 
@@ -78,6 +82,8 @@ int main(void)
 
 int main(void)
 {
+	wait_for_network();
+
 	return 0;
 }
 
diff --git a/samples/net/sockets/echo/overlay-nrf700x.conf b/samples/net/sockets/echo/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/sockets/echo/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/echo_async/Kconfig.sysbuild b/samples/net/sockets/echo_async/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/sockets/echo_async/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_async/README.rst b/samples/net/sockets/echo_async/README.rst
index 826b3ffbda5a..1b9beccdbcb5 100644
--- a/samples/net/sockets/echo_async/README.rst
+++ b/samples/net/sockets/echo_async/README.rst
@@ -49,6 +49,12 @@ another terminal window and run the same telnet command as above.
 The sample supports up to three connected clients, but this can be adjusted
 by changing ``NUM_FDS`` defined in the source code.
 
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
+
 Running application on POSIX Host
 =================================
 
diff --git a/samples/net/sockets/echo_async/overlay-nrf700x.conf b/samples/net/sockets/echo_async/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/sockets/echo_async/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/echo_async/sample.yaml b/samples/net/sockets/echo_async/sample.yaml
index 39b33bd31650..811f2115c57b 100644
--- a/samples/net/sockets/echo_async/sample.yaml
+++ b/samples/net/sockets/echo_async/sample.yaml
@@ -12,3 +12,9 @@ tests:
   sample.net.sockets.echo_async:
     extra_configs:
       - CONFIG_POSIX_API=y
+  sample.net.sockets.echo_async.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/echo_async/src/socket_echo.c b/samples/net/sockets/echo_async/src/socket_echo.c
index 33dadfbf9e7c..b38eb62c0017 100644
--- a/samples/net/sockets/echo_async/src/socket_echo.c
+++ b/samples/net/sockets/echo_async/src/socket_echo.c
@@ -26,6 +26,8 @@
 #include <zephyr/net/socket.h>
 #include <zephyr/kernel.h>
 
+#include "net_sample_common.h"
+
 #ifdef CONFIG_NET_IPV6
 #define USE_IPV6
 #endif
@@ -128,6 +130,8 @@ int main(void)
 	};
 #endif
 
+	wait_for_network();
+
 #if !defined(USE_IPV6) || !(CONFIG_SOC_SERIES_CC32XX)
 	serv4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (serv4 < 0) {
diff --git a/samples/net/sockets/echo_client/Kconfig.sysbuild b/samples/net/sockets/echo_client/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/sockets/echo_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_client/overlay-nrf700x.conf b/samples/net/sockets/echo_client/overlay-nrf700x.conf
deleted file mode 100644
index cbc47b965727..000000000000
--- a/samples/net/sockets/echo_client/overlay-nrf700x.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_POSIX_MAX_FDS=16
-
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/echo_client/src/common.h b/samples/net/sockets/echo_client/src/common.h
index d7a8b6c69e5d..76bbc5604ded 100644
--- a/samples/net/sockets/echo_client/src/common.h
+++ b/samples/net/sockets/echo_client/src/common.h
@@ -42,7 +42,7 @@ struct udp_control {
 	struct k_timer rx_timer;
 };
 
-struct data {
+struct sample_data {
 	const char *proto;
 
 	struct {
@@ -62,8 +62,8 @@ struct data {
 };
 
 struct configs {
-	struct data ipv4;
-	struct data ipv6;
+	struct sample_data ipv4;
+	struct sample_data ipv6;
 };
 
 #if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index eee8994425cc..32019849d8fa 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -47,7 +47,7 @@ static ssize_t sendall(int sock, const void *buf, size_t len)
 	return 0;
 }
 
-static int send_tcp_data(struct data *data)
+static int send_tcp_data(struct sample_data *data)
 {
 	int ret;
 
@@ -72,7 +72,7 @@ static int send_tcp_data(struct data *data)
 	return ret;
 }
 
-static int compare_tcp_data(struct data *data, const char *buf, uint32_t received)
+static int compare_tcp_data(struct sample_data *data, const char *buf, uint32_t received)
 {
 	if (data->tcp.received + received > data->tcp.expecting) {
 		LOG_ERR("Too much data received: TCP %s", data->proto);
@@ -87,16 +87,16 @@ static int compare_tcp_data(struct data *data, const char *buf, uint32_t receive
 	return 0;
 }
 
-static int start_tcp_proto(struct data *data, struct sockaddr *addr,
-			   socklen_t addrlen)
+static int start_tcp_proto(struct sample_data *data, sa_family_t family,
+			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
 	int ret;
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
-	data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TLS_1_2);
+	data->tcp.sock = socket(family, SOCK_STREAM, IPPROTO_TLS_1_2);
 #else
-	data->tcp.sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
+	data->tcp.sock = socket(family, SOCK_STREAM, IPPROTO_TCP);
 #endif
 	if (data->tcp.sock < 0) {
 		LOG_ERR("Failed to create TCP socket (%s): %d", data->proto,
@@ -108,7 +108,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 		struct sockaddr proxy_addr;
 		socklen_t proxy_addrlen;
 
-		if (addr->sa_family == AF_INET) {
+		if (family == AF_INET) {
 			struct sockaddr_in *proxy4 =
 				(struct sockaddr_in *)&proxy_addr;
 
@@ -117,7 +117,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 			inet_pton(AF_INET, SOCKS5_PROXY_V4_ADDR,
 				  &proxy4->sin_addr);
 			proxy_addrlen = sizeof(struct sockaddr_in);
-		} else if (addr->sa_family == AF_INET6) {
+		} else if (family == AF_INET6) {
 			struct sockaddr_in6 *proxy6 =
 				(struct sockaddr_in6 *)&proxy_addr;
 
@@ -163,7 +163,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 #endif
 
 	/* Prefer IPv6 temporary addresses */
-	if (addr->sa_family == AF_INET6) {
+	if (family == AF_INET6) {
 		optval = IPV6_PREFER_SRC_TMP;
 		(void)setsockopt(data->tcp.sock, IPPROTO_IPV6,
 				 IPV6_ADDR_PREFERENCES,
@@ -180,7 +180,7 @@ static int start_tcp_proto(struct data *data, struct sockaddr *addr,
 	return ret;
 }
 
-static int process_tcp_proto(struct data *data)
+static int process_tcp_proto(struct sample_data *data)
 {
 	int ret, received;
 	char buf[RECV_BUF_SIZE];
@@ -242,7 +242,7 @@ int start_tcp(void)
 		inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
 			  &addr6.sin6_addr);
 
-		ret = start_tcp_proto(&conf.ipv6,
+		ret = start_tcp_proto(&conf.ipv6, AF_INET6,
 				      (struct sockaddr *)&addr6,
 				      sizeof(addr6));
 		if (ret < 0) {
@@ -256,7 +256,8 @@ int start_tcp(void)
 		inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
 			  &addr4.sin_addr);
 
-		ret = start_tcp_proto(&conf.ipv4, (struct sockaddr *)&addr4,
+		ret = start_tcp_proto(&conf.ipv4, AF_INET,
+				      (struct sockaddr *)&addr4,
 				      sizeof(addr4));
 		if (ret < 0) {
 			return ret;
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 3055c2d03f26..49b6c14b8f1f 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -36,7 +36,7 @@ static struct k_thread udp_tx_thread;
 static struct udp_control udp4_ctrl, udp6_ctrl;
 static struct k_poll_signal udp_kill;
 
-static int send_udp_data(struct data *data);
+static int send_udp_data(struct sample_data *data);
 static void wait_reply(struct k_timer *timer);
 static void wait_transmit(struct k_timer *timer);
 
@@ -136,7 +136,7 @@ void init_udp(void)
 	}
 }
 
-static int send_udp_data(struct data *data)
+static int send_udp_data(struct sample_data *data)
 {
 	int ret;
 
@@ -156,7 +156,7 @@ static int send_udp_data(struct data *data)
 	return ret < 0 ? -EIO : 0;
 }
 
-static int compare_udp_data(struct data *data, const char *buf, uint32_t received)
+static int compare_udp_data(struct sample_data *data, const char *buf, uint32_t received)
 {
 	if (received != data->udp.expecting) {
 		LOG_ERR("Invalid amount of data received: UDP %s", data->proto);
@@ -175,7 +175,7 @@ static void wait_reply(struct k_timer *timer)
 {
 	/* This means that we did not receive response in time. */
 	struct udp_control *ctrl = CONTAINER_OF(timer, struct udp_control, rx_timer);
-	struct data *data = (ctrl == conf.ipv4.udp.ctrl) ? &conf.ipv4 : &conf.ipv6;
+	struct sample_data *data = (ctrl == conf.ipv4.udp.ctrl) ? &conf.ipv4 : &conf.ipv6;
 
 	LOG_ERR("UDP %s: Data packet not received", data->proto);
 
@@ -190,16 +190,16 @@ static void wait_transmit(struct k_timer *timer)
 	k_poll_signal_raise(&ctrl->tx_signal, 0);
 }
 
-static int start_udp_proto(struct data *data, struct sockaddr *addr,
-			   socklen_t addrlen)
+static int start_udp_proto(struct sample_data *data, sa_family_t family,
+			   struct sockaddr *addr, socklen_t addrlen)
 {
 	int optval;
 	int ret;
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
-	data->udp.sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
+	data->udp.sock = socket(family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
 #else
-	data->udp.sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
+	data->udp.sock = socket(family, SOCK_DGRAM, IPPROTO_UDP);
 #endif
 	if (data->udp.sock < 0) {
 		LOG_ERR("Failed to create UDP socket (%s): %d", data->proto,
@@ -233,7 +233,7 @@ static int start_udp_proto(struct data *data, struct sockaddr *addr,
 #endif
 
 	/* Prefer IPv6 temporary addresses */
-	if (addr->sa_family == AF_INET6) {
+	if (family == AF_INET6) {
 		optval = IPV6_PREFER_SRC_TMP;
 		(void)setsockopt(data->udp.sock, IPPROTO_IPV6,
 				 IPV6_ADDR_PREFERENCES,
@@ -251,7 +251,7 @@ static int start_udp_proto(struct data *data, struct sockaddr *addr,
 	return ret;
 }
 
-static int process_udp_proto(struct data *data)
+static int process_udp_proto(struct sample_data *data)
 {
 	int ret, received;
 
@@ -312,7 +312,7 @@ int start_udp(void)
 		inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
 			  &addr6.sin6_addr);
 
-		ret = start_udp_proto(&conf.ipv6,
+		ret = start_udp_proto(&conf.ipv6, AF_INET6,
 				      (struct sockaddr *)&addr6,
 				      sizeof(addr6));
 		if (ret < 0) {
@@ -326,7 +326,8 @@ int start_udp(void)
 		inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
 			  &addr4.sin_addr);
 
-		ret = start_udp_proto(&conf.ipv4, (struct sockaddr *)&addr4,
+		ret = start_udp_proto(&conf.ipv4, AF_INET,
+				      (struct sockaddr *)&addr4,
 				      sizeof(addr4));
 		if (ret < 0) {
 			return ret;
diff --git a/samples/net/sockets/echo_server/Kconfig.sysbuild b/samples/net/sockets/echo_server/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/sockets/echo_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_server/overlay-nrf700x.conf b/samples/net/sockets/echo_server/overlay-nrf700x.conf
deleted file mode 100644
index cbc47b965727..000000000000
--- a/samples/net/sockets/echo_server/overlay-nrf700x.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_POSIX_MAX_FDS=16
-
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/http_get/Kconfig.sysbuild b/samples/net/sockets/http_get/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/sockets/http_get/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/http_get/README.rst b/samples/net/sockets/http_get/README.rst
index 09bfb2050d16..bf2f058eb4da 100644
--- a/samples/net/sockets/http_get/README.rst
+++ b/samples/net/sockets/http_get/README.rst
@@ -69,6 +69,12 @@ Note, that TLS support in the sample depends on non-posix, TLS socket
 functionality. Therefore, it is only possible to run TLS in this sample
 on Zephyr.
 
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
+
 Running application on POSIX Host
 =================================
 
diff --git a/samples/net/sockets/http_get/overlay-nrf700x.conf b/samples/net/sockets/http_get/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/sockets/http_get/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index 2aba5c7d60d8..292058bfce97 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -57,3 +57,9 @@ tests:
       - native_sim
       - native_sim/native/64
     extra_args: OVERLAY_CONFIG="overlay-nsos.conf;overlay-tls.conf"
+  sample.net.sockets.http_get.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/http_get/src/http_get.c b/samples/net/sockets/http_get/src/http_get.c
index c6d16b53461c..b4ad0ff8410c 100644
--- a/samples/net/sockets/http_get/src/http_get.c
+++ b/samples/net/sockets/http_get/src/http_get.c
@@ -25,6 +25,8 @@
 #include "ca_certificate.h"
 #endif
 
+#include "net_sample_common.h"
+
 #endif
 
 /* HTTP server to connect to */
@@ -61,6 +63,8 @@ int main(void)
 	struct addrinfo *res;
 	int st, sock;
 
+	wait_for_network();
+
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 	tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
 			   ca_certificate, sizeof(ca_certificate));
diff --git a/samples/net/sockets/sntp_client/CMakeLists.txt b/samples/net/sockets/sntp_client/CMakeLists.txt
index 3d23993968ba..b42a3549dd65 100644
--- a/samples/net/sockets/sntp_client/CMakeLists.txt
+++ b/samples/net/sockets/sntp_client/CMakeLists.txt
@@ -6,3 +6,5 @@ project(sntp_client)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/sntp_client/Kconfig.sysbuild b/samples/net/sockets/sntp_client/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/sockets/sntp_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/sntp_client/README.rst b/samples/net/sockets/sntp_client/README.rst
index f9a1aacd4b8f..72c068778485 100644
--- a/samples/net/sockets/sntp_client/README.rst
+++ b/samples/net/sockets/sntp_client/README.rst
@@ -28,3 +28,9 @@ This sample can be built and executed on QEMU or native_sim board as
 described in :ref:`networking_with_qemu`.
 
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/sockets/sntp_client/overlay-nrf700x.conf b/samples/net/sockets/sntp_client/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/sockets/sntp_client/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/sockets/sntp_client/sample.yaml b/samples/net/sockets/sntp_client/sample.yaml
index aba249df18aa..762da6d00007 100644
--- a/samples/net/sockets/sntp_client/sample.yaml
+++ b/samples/net/sockets/sntp_client/sample.yaml
@@ -9,3 +9,9 @@ tests:
     platform_allow:
       - qemu_x86
       - native_sim
+  sample.net.sockets.sntp_client.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/sockets/sntp_client/src/main.c b/samples/net/sockets/sntp_client/src/main.c
index 585ce1d1b431..66cf8a759e85 100644
--- a/samples/net/sockets/sntp_client/src/main.c
+++ b/samples/net/sockets/sntp_client/src/main.c
@@ -12,6 +12,7 @@ LOG_MODULE_REGISTER(net_sntp_client_sample, LOG_LEVEL_DBG);
 #include <arpa/inet.h>
 
 #include "config.h"
+#include "net_sample_common.h"
 
 #define SNTP_PORT 123
 
@@ -25,6 +26,8 @@ int main(void)
 	struct sntp_time sntp_time;
 	int rv;
 
+	wait_for_network();
+
 	/* ipv4 */
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
diff --git a/samples/net/syslog_net/CMakeLists.txt b/samples/net/syslog_net/CMakeLists.txt
index c6c052e8a902..99c7d474c3b3 100644
--- a/samples/net/syslog_net/CMakeLists.txt
+++ b/samples/net/syslog_net/CMakeLists.txt
@@ -7,3 +7,5 @@ project(syslog_net)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/syslog_net/Kconfig.sysbuild b/samples/net/syslog_net/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/syslog_net/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/syslog_net/README.rst b/samples/net/syslog_net/README.rst
index dd5908714b9c..acc27ff05821 100644
--- a/samples/net/syslog_net/README.rst
+++ b/samples/net/syslog_net/README.rst
@@ -51,3 +51,9 @@ Build syslog_net sample application like this:
    :conf: <config file to use>
    :goals: build
    :compact:
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/syslog_net/overlay-nrf700x.conf b/samples/net/syslog_net/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/syslog_net/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/syslog_net/sample.yaml b/samples/net/syslog_net/sample.yaml
index 4fe99e593ff1..7770f1ea80b0 100644
--- a/samples/net/syslog_net/sample.yaml
+++ b/samples/net/syslog_net/sample.yaml
@@ -37,3 +37,9 @@ tests:
       - CONFIG_LOG_BACKEND_NET_AUTOSTART=n
       - CONFIG_LOG_BACKEND_NET_SERVER=""
       - CONFIG_NET_SAMPLE_SERVER_RUNTIME="192.0.2.2:514"
+  sample.net.syslog.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/syslog_net/src/main.c b/samples/net/syslog_net/src/main.c
index f0362648f050..da499fec741f 100644
--- a/samples/net/syslog_net/src/main.c
+++ b/samples/net/syslog_net/src/main.c
@@ -15,6 +15,8 @@ LOG_MODULE_REGISTER(net_syslog, LOG_LEVEL_DBG);
 
 #include <stdlib.h>
 
+#include "net_sample_common.h"
+
 BUILD_ASSERT(IS_ENABLED(CONFIG_LOG_BACKEND_NET), "syslog backend not enabled");
 
 #define SLEEP_BETWEEN_PRINTS 3
@@ -25,6 +27,8 @@ int main(void)
 
 	LOG_DBG("Starting");
 
+	wait_for_network();
+
 	if (!IS_ENABLED(CONFIG_LOG_BACKEND_NET_AUTOSTART)) {
 		/* Example how to start the backend if autostart is disabled.
 		 * This is useful if the application needs to wait the network
diff --git a/samples/net/telnet/CMakeLists.txt b/samples/net/telnet/CMakeLists.txt
index 342f2dbee48e..6dfd6ba8ef96 100644
--- a/samples/net/telnet/CMakeLists.txt
+++ b/samples/net/telnet/CMakeLists.txt
@@ -6,3 +6,5 @@ project(telnet)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/telnet/Kconfig.sysbuild b/samples/net/telnet/Kconfig.sysbuild
new file mode 100644
index 000000000000..158551060c56
--- /dev/null
+++ b/samples/net/telnet/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/telnet/README.rst b/samples/net/telnet/README.rst
index 1c648e2e970f..7eb82cd9ddae 100644
--- a/samples/net/telnet/README.rst
+++ b/samples/net/telnet/README.rst
@@ -128,3 +128,9 @@ On your linux host:
 
 You are now connected, and as for the UART console, you can type in
 your commands and get the output through your telnet client.
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.
diff --git a/samples/net/telnet/overlay-nrf700x.conf b/samples/net/telnet/overlay-nrf700x.conf
deleted file mode 100644
index aa59e5d5ea2d..000000000000
--- a/samples/net/telnet/overlay-nrf700x.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WPA_SUPP=y
-CONFIG_NET_L2_ETHERNET=y
-
-# DHCPv4
-CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
-CONFIG_NET_DHCPV4=y
-
-# Connection manager
-CONFIG_NET_CONNECTION_MANAGER=y
-
-# Credentials
-CONFIG_WIFI_CREDENTIALS=y
-CONFIG_WIFI_CREDENTIALS_STATIC=y
-CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
-CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
diff --git a/samples/net/telnet/sample.yaml b/samples/net/telnet/sample.yaml
index c3987d33634d..508b76fe4f6e 100644
--- a/samples/net/telnet/sample.yaml
+++ b/samples/net/telnet/sample.yaml
@@ -1,12 +1,19 @@
+common:
+  harness: net
+  depends_on: netif
+  tags:
+    - net
+    - telnet
 sample:
   name: Telnet Server
 tests:
   sample.net.telnet:
-    harness: net
-    depends_on: netif
-    tags:
-      - net
-      - telnet
     platform_exclude:
       - native_posix
       - native_posix/native/64
+  sample.net.telnet.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp
diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index e1cc53095a4a..f8df416e39ae 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -16,111 +16,15 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_mgmt.h>
 
-#if defined(CONFIG_NET_DHCPV4)
-static struct net_mgmt_event_callback mgmt_cb;
-
-static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  uint32_t mgmt_event,
-				  struct net_if *iface)
-{
-	char hr_addr[NET_IPV4_ADDR_LEN];
-	int i = 0;
-
-	if (mgmt_event != NET_EVENT_IPV4_ADDR_ADD) {
-		/* Spurious callback. */
-		return;
-	}
-
-	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
-		struct net_if_addr *if_addr =
-			&iface->config.ip.ipv4->unicast[i];
-
-		if (if_addr->addr_type != NET_ADDR_DHCP || !if_addr->is_used) {
-			continue;
-		}
-
-		LOG_INF("IPv4 address: %s",
-			net_addr_ntop(AF_INET,
-				      &if_addr->address.in_addr,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		LOG_INF("Lease time: %u seconds",
-			 iface->config.dhcpv4.lease_time);
-		LOG_INF("Subnet: %s",
-			net_addr_ntop(AF_INET,
-				      &iface->config.ip.ipv4->netmask,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		LOG_INF("Router: %s",
-			net_addr_ntop(AF_INET,
-				      &iface->config.ip.ipv4->gw,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		break;
-	}
-}
-
-static void setup_dhcpv4(struct net_if *iface)
-{
-	LOG_INF("Running dhcpv4 client...");
-
-	net_mgmt_init_event_callback(&mgmt_cb, ipv4_addr_add_handler,
-				     NET_EVENT_IPV4_ADDR_ADD);
-	net_mgmt_add_event_callback(&mgmt_cb);
-
-	net_dhcpv4_start(iface);
-}
-
-#else
-#define setup_dhcpv4(...)
-#endif /* CONFIG_NET_DHCPV4 */
-
-#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4)
-
-#if !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
-#error "You need to define an IPv4 Address or enable DHCPv4!"
-#endif
-
-static void setup_ipv4(struct net_if *iface)
-{
-	char hr_addr[NET_IPV4_ADDR_LEN];
-	struct in_addr addr;
-
-	if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) {
-		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR);
-		return;
-	}
-
-	net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
-
-	LOG_INF("IPv4 address: %s",
-		net_addr_ntop(AF_INET, &addr, hr_addr,
-			      NET_IPV4_ADDR_LEN));
-}
-
-#else
-#define setup_ipv4(...)
-#endif /* CONFIG_NET_IPV4 && !CONFIG_NET_DHCPV4 */
+#include "net_sample_common.h"
 
 #if defined(CONFIG_NET_IPV6)
-
 #define MCAST_IP6ADDR "ff84::2"
 
-#ifndef CONFIG_NET_CONFIG_MY_IPV6_ADDR
-#error "You need to define an IPv6 Address!"
-#endif
-
-static void setup_ipv6(struct net_if *iface)
+static void setup_ipv6(void)
 {
-	char hr_addr[NET_IPV6_ADDR_LEN];
 	struct in6_addr addr;
-
-	if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &addr)) {
-		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR);
-		return;
-	}
-
-	net_if_ipv6_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
-
-	LOG_INF("IPv6 address: %s",
-		net_addr_ntop(AF_INET6, &addr, hr_addr, NET_IPV6_ADDR_LEN));
+	struct net_if *iface = net_if_get_default();
 
 	if (net_addr_pton(AF_INET6, MCAST_IP6ADDR, &addr)) {
 		LOG_ERR("Invalid address: %s", MCAST_IP6ADDR);
@@ -129,21 +33,15 @@ static void setup_ipv6(struct net_if *iface)
 
 	net_if_ipv6_maddr_add(iface, &addr);
 }
-
 #else
 #define setup_ipv6(...)
 #endif /* CONFIG_NET_IPV6 */
 
 int main(void)
 {
-	struct net_if *iface = net_if_get_default();
-
 	LOG_INF("Starting Telnet sample");
 
-	setup_ipv4(iface);
-
-	setup_dhcpv4(iface);
-
-	setup_ipv6(iface);
+	wait_for_network();
+	setup_ipv6();
 	return 0;
 }
diff --git a/snippets/wifi-ipv4/README.rst b/snippets/wifi-ipv4/README.rst
new file mode 100644
index 000000000000..89139c56d790
--- /dev/null
+++ b/snippets/wifi-ipv4/README.rst
@@ -0,0 +1,28 @@
+.. _snippet-wifi-ipv4:
+
+Wi-Fi IPv4 Snippet (wifi-ipv4)
+##############################
+
+.. code-block:: console
+
+   west build -S wifi-ipv4 [...]
+
+Overview
+********
+
+This snippet enables IPv4 Wi-Fi support in supported networking samples.
+The sample execution is postponed until Wi-Fi connectivity is established.
+
+Use Wi-Fi shell to connect to the Wi-Fi network:
+
+.. code-block:: console
+
+   wifi connect -s <SSID> -k <key_management> -p <passphrase>
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_WIFI`
+- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
diff --git a/snippets/wifi-ipv4/snippet.yml b/snippets/wifi-ipv4/snippet.yml
new file mode 100644
index 000000000000..cde1bb348d8a
--- /dev/null
+++ b/snippets/wifi-ipv4/snippet.yml
@@ -0,0 +1,3 @@
+name: wifi-ipv4
+append:
+  EXTRA_CONF_FILE: wifi-ipv4.conf
diff --git a/snippets/wifi-ipv4/wifi-ipv4.conf b/snippets/wifi-ipv4/wifi-ipv4.conf
new file mode 100644
index 000000000000..59f4eafc2222
--- /dev/null
+++ b/snippets/wifi-ipv4/wifi-ipv4.conf
@@ -0,0 +1,31 @@
+# Wi-Fi
+CONFIG_WIFI=y
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+
+# Make sure there is enough resources for supplicant and most of the samples
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZVFS_OPEN_MAX=24
+CONFIG_NET_MAX_CONN=10
+CONFIG_NET_SOCKETS_POLL_MAX=9
+
+# IPv4 only for now
+CONFIG_NET_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_IPV4=y
+
+# DHCPv4
+CONFIG_NET_DHCPV4=y
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_INIT_TIMEOUT=0
+
+# DNS
+CONFIG_DNS_RESOLVER=y
+
+# Connection manager
+CONFIG_NET_CONNECTION_MANAGER=y
+
+# Wi-Fi shell
+CONFIG_NET_SHELL=y
+CONFIG_NET_L2_WIFI_SHELL=y
+CONFIG_SHELL_STACK_SIZE=5200
diff --git a/subsys/logging/backends/log_backend_net.c b/subsys/logging/backends/log_backend_net.c
index 3f49e0a40881..f968a6cf4f6b 100644
--- a/subsys/logging/backends/log_backend_net.c
+++ b/subsys/logging/backends/log_backend_net.c
@@ -99,12 +99,14 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
 	if (IS_ENABLED(CONFIG_NET_IPV4) && server_addr.sa_family == AF_INET) {
 		local_addr = (struct sockaddr *)&local_addr4;
 		server_addr_len = sizeof(struct sockaddr_in);
+		local_addr4.sin_family = AF_INET;
 		local_addr4.sin_port = 0U;
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV6) && server_addr.sa_family == AF_INET6) {
 		local_addr = (struct sockaddr *)&local_addr6;
 		server_addr_len = sizeof(struct sockaddr_in6);
+		local_addr6.sin6_family = AF_INET6;
 		local_addr6.sin6_port = 0U;
 	}
 
@@ -113,8 +115,6 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
 		return -EINVAL;
 	}
 
-	local_addr->sa_family = server_addr.sa_family;
-
 	if (ctx->is_tcp) {
 		proto = IPPROTO_TCP;
 		type = SOCK_STREAM;
diff --git a/subsys/net/conn_mgr/CMakeLists.txt b/subsys/net/conn_mgr/CMakeLists.txt
index 68ca0f1388fa..d9a6cd30c0c6 100644
--- a/subsys/net/conn_mgr/CMakeLists.txt
+++ b/subsys/net/conn_mgr/CMakeLists.txt
@@ -10,4 +10,4 @@ zephyr_library_sources(
 	)
 
 zephyr_linker_sources(DATA_SECTIONS conn_mgr.ld)
-zephyr_iterable_section(NAME conn_mgr_conn_binding GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME conn_mgr_conn_binding GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 6548e814bc36..bab445e82629 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -20,7 +20,7 @@ zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_UTILS wifi_utils.c)
 # Linker section placement for wifi_nm_instance iterable structure
 zephyr_linker_sources_ifdef(CONFIG_WIFI_NM DATA_SECTIONS wifi_nm.ld)
 if (CONFIG_WIFI_NM)
-zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME wifi_nm_instance GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 # Wi-Fi Enterprise test certificates handling
diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index 08672b78e7ac..3adde74cf442 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -240,6 +240,10 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 				goto out;
 			}
 
+			if (ctx->fds[i].fd < 0) {
+				continue;
+			}
+
 			if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 				dispatch_table[ctx->fds[i].fd].ctx = ctx;
 			}
@@ -277,6 +281,10 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx)
 			goto out;
 		}
 
+		if (ctx->fds[i].fd < 0) {
+			continue;
+		}
+
 		if (dispatch_table[ctx->fds[i].fd].ctx == NULL) {
 			dispatch_table[ctx->fds[i].fd].ctx = ctx;
 		}
diff --git a/tests/misc/iterable_sections/CMakeLists.txt b/tests/misc/iterable_sections/CMakeLists.txt
index 350c2a5ca0ef..2519c45a5c31 100644
--- a/tests/misc/iterable_sections/CMakeLists.txt
+++ b/tests/misc/iterable_sections/CMakeLists.txt
@@ -8,15 +8,15 @@ FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(DATA_SECTIONS sections-ram.ld)
-zephyr_iterable_section(NAME test_ram GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_ram2 GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_ram_named GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_ram_numeric NUMERIC GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME ramn_alt GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_ram GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram2 GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram_named GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_ram_numeric NUMERIC GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME ramn_alt GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME test_rom KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_rom2 KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_rom_named KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME test_rom_numeric NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME romn_alt KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME test_rom KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom2 KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom_named KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME test_rom_numeric NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME romn_alt KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/common/CMakeLists.txt b/tests/net/lib/http_server/common/CMakeLists.txt
index add7abe2de34..a2e5b4998088 100644
--- a/tests/net/lib/http_server/common/CMakeLists.txt
+++ b/tests/net/lib/http_server/common/CMakeLists.txt
@@ -8,5 +8,5 @@ FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_service_A KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
-zephyr_iterable_section(NAME http_resource_desc_service_B KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_service_A KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME http_resource_desc_service_B KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/core/CMakeLists.txt b/tests/net/lib/http_server/core/CMakeLists.txt
index aa64e0bcf6ed..7d47b3be9e22 100644
--- a/tests/net/lib/http_server/core/CMakeLists.txt
+++ b/tests/net/lib/http_server/core/CMakeLists.txt
@@ -15,4 +15,4 @@ set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/)
 target_link_libraries(app PRIVATE zephyr_interface zephyr)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/crime/CMakeLists.txt b/tests/net/lib/http_server/crime/CMakeLists.txt
index d991ae1d3f6b..0e930e194d70 100644
--- a/tests/net/lib/http_server/crime/CMakeLists.txt
+++ b/tests/net/lib/http_server/crime/CMakeLists.txt
@@ -21,4 +21,4 @@ generate_inc_file_for_target(app ${source_file_not_found} ${gen_dir}/not_found_p
 generate_inc_file_for_target(app ${source_file_not_found} ${gen_dir}/not_found_page.html.gz.inc --gzip)
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
diff --git a/tests/net/lib/http_server/tls/CMakeLists.txt b/tests/net/lib/http_server/tls/CMakeLists.txt
index 35f1805f63e4..f277bc750b27 100644
--- a/tests/net/lib/http_server/tls/CMakeLists.txt
+++ b/tests/net/lib/http_server/tls/CMakeLists.txt
@@ -51,4 +51,4 @@ FILE(GLOB app_sources src/main.c)
 target_sources(app PRIVATE ${app_sources})
 
 zephyr_linker_sources(SECTIONS sections-rom.ld)
-zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
+zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})