diff --git a/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_master/defconfig b/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_master/defconfig
index 413294e24b375..ff27e2521997b 100644
--- a/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_master/defconfig
+++ b/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_master/defconfig
@@ -41,6 +41,8 @@ CONFIG_EXAMPLES_MODBUSMASTER=y
 CONFIG_EXAMPLES_MODBUSMASTER_SLAVEADDR=10
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INDUSTRY_MODBUS=y
+CONFIG_INDUSTRY_MODBUS_MASTER=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INPUT=y
 CONFIG_INPUT_BUTTONS=y
@@ -48,8 +50,6 @@ CONFIG_INPUT_BUTTONS_LOWER=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LINE_MAX=64
 CONFIG_MB_RTU_MASTER=y
-CONFIG_MODBUS=y
-CONFIG_MODBUS_MASTER=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_slave/defconfig b/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_slave/defconfig
index 7037286ee9c2f..017ec108be831 100644
--- a/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_slave/defconfig
+++ b/boards/arm/stm32/stm32f401rc-rs485/configs/modbus_slave/defconfig
@@ -35,14 +35,14 @@ CONFIG_EXAMPLES_MODBUS=y
 CONFIG_EXAMPLES_MODBUS_PORT=1
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INDUSTRY_MODBUS=y
+CONFIG_INDUSTRY_MODBUS_SLAVE=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INPUT=y
 CONFIG_INPUT_BUTTONS=y
 CONFIG_INPUT_BUTTONS_LOWER=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LINE_MAX=64
-CONFIG_MODBUS=y
-CONFIG_MODBUS_SLAVE=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig b/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig
index d7da18d7c5dfd..0eba5c05bcf09 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/modbus_slave/defconfig
@@ -29,12 +29,12 @@ CONFIG_EXAMPLES_MODBUS_PORT=1
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_INDUSTRY_MODBUS=y
+CONFIG_INDUSTRY_MODBUS_SLAVE=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LINE_MAX=64
 CONFIG_MM_REGIONS=2
-CONFIG_MODBUS=y
-CONFIG_MODBUS_SLAVE=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_master/defconfig b/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_master/defconfig
index 739dcc6298e71..ee052007c56bd 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_master/defconfig
+++ b/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_master/defconfig
@@ -38,15 +38,14 @@ CONFIG_EXAMPLES_MODBUSMASTER=y
 CONFIG_EXAMPLES_MODBUSMASTER_PORT=2
 CONFIG_EXAMPLES_MODBUSMASTER_PROGNAME="mbmaster"
 CONFIG_EXAMPLES_MODBUSMASTER_SLAVEADDR=10
+CONFIG_INDUSTRY_MODBUS=y
+CONFIG_INDUSTRY_MODBUS_MASTER=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBM=y
 CONFIG_LINE_MAX=64
-CONFIG_MB_PORT_HAS_CLOSE=y
 CONFIG_MB_RTU_MASTER=y
 CONFIG_MM_REGIONS=4
-CONFIG_MODBUS=y
-CONFIG_MODBUS_MASTER=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_slave/defconfig b/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_slave/defconfig
index f1c39b1025eca..b8283c2569771 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_slave/defconfig
+++ b/boards/arm/stm32h7/linum-stm32h753bi/configs/modbus_slave/defconfig
@@ -30,13 +30,13 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_EXAMPLES_ALARM=y
 CONFIG_EXAMPLES_MODBUS=y
 CONFIG_EXAMPLES_MODBUS_PORT=2
+CONFIG_INDUSTRY_MODBUS=y
+CONFIG_INDUSTRY_MODBUS_SLAVE=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBM=y
 CONFIG_LINE_MAX=64
 CONFIG_MM_REGIONS=4
-CONFIG_MODBUS=y
-CONFIG_MODBUS_SLAVE=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig
index 237de87183e91..c99b2fff83adf 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig
@@ -35,13 +35,13 @@ CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
+CONFIG_INDUSTRY_MODBUS=y
+CONFIG_INDUSTRY_MODBUS_SLAVE=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INIT_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LINE_MAX=64
 CONFIG_MM_REGIONS=3
-CONFIG_MODBUS=y
-CONFIG_MODBUS_SLAVE=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512