diff --git a/samples/shields/x_nucleo_iks01a3/sensorhub/CMakeLists.txt b/samples/shields/x_nucleo_iks01a3/sensorhub/CMakeLists.txt
index 6bea053fb2..620522e174 100644
--- a/samples/shields/x_nucleo_iks01a3/sensorhub/CMakeLists.txt
+++ b/samples/shields/x_nucleo_iks01a3/sensorhub/CMakeLists.txt
@@ -7,10 +7,6 @@ cmake_minimum_required(VERSION 3.20.0)
 # This sample is specific to x_nucleo_iks01a3 shield. Enforce -DSHIELD option
 set(SHIELD x_nucleo_iks01a3_shub)
 
-if(BOARD STREQUAL stm32mp157c_dk2)
-  set(CONF_FILE stm32mp157c_dk2.conf)
-endif()
-
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(x_nucleo_iks01a3)
 
diff --git a/samples/shields/x_nucleo_iks01a3/sensorhub/boards/stm32mp157c_dk2.conf b/samples/shields/x_nucleo_iks01a3/sensorhub/boards/stm32mp157c_dk2.conf
new file mode 100644
index 0000000000..f6f0161312
--- /dev/null
+++ b/samples/shields/x_nucleo_iks01a3/sensorhub/boards/stm32mp157c_dk2.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2019 STMicroelectronics
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_LSM6DSO_TRIGGER_OWN_THREAD=n
+CONFIG_LSM6DSO_TRIGGER_NONE=y
diff --git a/samples/shields/x_nucleo_iks01a3/sensorhub/stm32mp157c_dk2.conf b/samples/shields/x_nucleo_iks01a3/sensorhub/stm32mp157c_dk2.conf
deleted file mode 100644
index aeda7a4950..0000000000
--- a/samples/shields/x_nucleo_iks01a3/sensorhub/stm32mp157c_dk2.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_LOG=y
-CONFIG_STDOUT_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_SENSOR=y
-CONFIG_SENSOR_LOG_LEVEL_DBG=y
-CONFIG_LIS2DW12_TRIGGER_NONE=y
-CONFIG_LSM6DSO_ENABLE_TEMP=n
-CONFIG_LSM6DSO_TRIGGER_NONE=y
-CONFIG_LSM6DSO_SENSORHUB=y
-CONFIG_LSM6DSO_EXT_LIS2MDL=y
-CONFIG_LSM6DSO_EXT_LPS22HH=y
-CONFIG_LSM6DSO_EXT_HTS221=n
-CONFIG_CBPRINTF_FP_SUPPORT=y
diff --git a/samples/shields/x_nucleo_iks01a3/standard/CMakeLists.txt b/samples/shields/x_nucleo_iks01a3/standard/CMakeLists.txt
index 9908110c28..fceb87200e 100644
--- a/samples/shields/x_nucleo_iks01a3/standard/CMakeLists.txt
+++ b/samples/shields/x_nucleo_iks01a3/standard/CMakeLists.txt
@@ -7,10 +7,6 @@ cmake_minimum_required(VERSION 3.20.0)
 # This sample is specific to x_nucleo_iks01a3 shield. Enforce -DSHIELD option
 set(SHIELD x_nucleo_iks01a3)
 
-if(BOARD STREQUAL stm32mp157c_dk2)
-  set(CONF_FILE stm32mp157c_dk2.conf)
-endif()
-
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(x_nucleo_iks01a3)
 
diff --git a/samples/shields/x_nucleo_iks01a3/standard/boards/stm32mp157c_dk2.conf b/samples/shields/x_nucleo_iks01a3/standard/boards/stm32mp157c_dk2.conf
new file mode 100644
index 0000000000..25bc78b119
--- /dev/null
+++ b/samples/shields/x_nucleo_iks01a3/standard/boards/stm32mp157c_dk2.conf
@@ -0,0 +1,13 @@
+# Copyright (c) 2019 STMicroelectronics
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_LPS22HH_TRIGGER_OWN_THREAD=n
+CONFIG_LPS22HH_TRIGGER_NONE=y
+CONFIG_LIS2DW12_TRIGGER_OWN_THREAD=n
+CONFIG_LIS2DW12_TRIGGER_NONE=y
+CONFIG_LSM6DSO_TRIGGER_OWN_THREAD=n
+CONFIG_LSM6DSO_TRIGGER_NONE=y
+
+# DIL24 section
+CONFIG_LIS2DE12_ENABLE_TEMP=n
diff --git a/samples/shields/x_nucleo_iks01a3/standard/stm32mp157c_dk2.conf b/samples/shields/x_nucleo_iks01a3/standard/stm32mp157c_dk2.conf
deleted file mode 100644
index 8979a92203..0000000000
--- a/samples/shields/x_nucleo_iks01a3/standard/stm32mp157c_dk2.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_LOG=y
-CONFIG_STDOUT_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_SENSOR=y
-CONFIG_SENSOR_LOG_LEVEL_DBG=y
-CONFIG_HTS221_TRIGGER_NONE=y
-CONFIG_LPS22HH_TRIGGER_NONE=y
-CONFIG_STTS751_TRIGGER_NONE=y
-CONFIG_LIS2MDL_TRIGGER_NONE=y
-CONFIG_LIS2DW12_TRIGGER_NONE=y
-CONFIG_LSM6DSO_ENABLE_TEMP=n
-CONFIG_LSM6DSO_TRIGGER_NONE=y
-CONFIG_CBPRINTF_FP_SUPPORT=y