diff --git a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_l4r5zi.overlay b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_l4r5zi.overlay
index 1dbe5efeec8..8e0cac01094 100644
--- a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_l4r5zi.overlay
+++ b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_l4r5zi.overlay
@@ -4,18 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/dt-bindings/gpio/stm32-gpio.h>
-
 / {
 	aliases {
 		wkup-src = &user_button;
 	};
 };
 
-&user_button {
-	gpios = <&gpioc 13 (GPIO_ACTIVE_HIGH | STM32_GPIO_WKUP)>;
-};
-
 &pwr {
 	status = "okay";
 };
diff --git a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u575zi_q.overlay b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u575zi_q.overlay
index 1dbe5efeec8..8e0cac01094 100644
--- a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u575zi_q.overlay
+++ b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u575zi_q.overlay
@@ -4,18 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/dt-bindings/gpio/stm32-gpio.h>
-
 / {
 	aliases {
 		wkup-src = &user_button;
 	};
 };
 
-&user_button {
-	gpios = <&gpioc 13 (GPIO_ACTIVE_HIGH | STM32_GPIO_WKUP)>;
-};
-
 &pwr {
 	status = "okay";
 };
diff --git a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u5a5zj_q.overlay b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u5a5zj_q.overlay
index 1dbe5efeec8..8e0cac01094 100644
--- a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u5a5zj_q.overlay
+++ b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_u5a5zj_q.overlay
@@ -4,18 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/dt-bindings/gpio/stm32-gpio.h>
-
 / {
 	aliases {
 		wkup-src = &user_button;
 	};
 };
 
-&user_button {
-	gpios = <&gpioc 13 (GPIO_ACTIVE_HIGH | STM32_GPIO_WKUP)>;
-};
-
 &pwr {
 	status = "okay";
 };
diff --git a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_wl55jc.overlay b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_wl55jc.overlay
index 7182d8a10af..7c792105d6d 100644
--- a/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_wl55jc.overlay
+++ b/samples/boards/stm32/power_mgmt/wkup_pins/boards/nucleo_wl55jc.overlay
@@ -4,18 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/dt-bindings/gpio/stm32-gpio.h>
-
 / {
 	aliases {
 		wkup-src = &user_button_1;
 	};
 };
 
-&user_button_1 {
-	gpios = <&gpioa 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP | STM32_GPIO_WKUP)>;
-};
-
 &pwr {
 	status = "okay";
 };
diff --git a/samples/boards/stm32/power_mgmt/wkup_pins/prj.conf b/samples/boards/stm32/power_mgmt/wkup_pins/prj.conf
index 1c68aa590c2..2331687b789 100644
--- a/samples/boards/stm32/power_mgmt/wkup_pins/prj.conf
+++ b/samples/boards/stm32/power_mgmt/wkup_pins/prj.conf
@@ -1,7 +1,2 @@
 CONFIG_POWEROFF=y
 CONFIG_STM32_WKUP_PINS=y
-CONFIG_INPUT=y
-CONFIG_INPUT_GPIO_KEYS=y
-CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_PM_DEVICE_RUNTIME=n
diff --git a/samples/boards/stm32/power_mgmt/wkup_pins/src/main.c b/samples/boards/stm32/power_mgmt/wkup_pins/src/main.c
index cd7d672cdf6..2284a76b035 100644
--- a/samples/boards/stm32/power_mgmt/wkup_pins/src/main.c
+++ b/samples/boards/stm32/power_mgmt/wkup_pins/src/main.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/poweroff.h>
+#include <zephyr/dt-bindings/gpio/stm32-gpio.h>
 
 #define WAIT_TIME_US 4000000
 
@@ -24,14 +25,14 @@ static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led0), gpios);
 
 int main(void)
 {
-	__ASSERT_NO_MSG(gpio_is_ready_dt(&button));
-	printk("\nWake-up button set up at %s pin %d\n", button.port->name, button.pin);
+	printk("\nWake-up button is connected to %s pin %d\n", button.port->name, button.pin);
 
 	__ASSERT_NO_MSG(gpio_is_ready_dt(&led));
 	gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
 	gpio_pin_set(led.port, led.pin, 1);
 
-	printk("Device is ready\n");
+	/* Setup button GPIO pin as a source for exiting Poweroff */
+	gpio_pin_configure_dt(&button, STM32_GPIO_WKUP);
 
 	printk("Will wait %ds before powering the system off\n", (WAIT_TIME_US / 1000000));
 	k_busy_wait(WAIT_TIME_US);