diff --git a/boards/arm/wio_terminal/wio_terminal.dts b/boards/arm/wio_terminal/wio_terminal.dts
index 2e2fe7500a0da67..45b429f6401d8a6 100644
--- a/boards/arm/wio_terminal/wio_terminal.dts
+++ b/boards/arm/wio_terminal/wio_terminal.dts
@@ -48,8 +48,10 @@
 	};
 
 	/* Buttons */
-	gpio_keys {
+	buttons {
 		compatible = "gpio-keys";
+		polling-mode;
+		debounce-interval-ms = <100>;
 		user_button_0: button_0 {
 			label = "User Button 0";
 			gpios = <&portc 26 GPIO_ACTIVE_LOW>;
@@ -65,6 +67,11 @@
 			gpios = <&portc 28 GPIO_ACTIVE_LOW>;
 			zephyr,code = <INPUT_KEY_2>;
 		};
+	};
+
+	/* Joystick */
+	joystick {
+		compatible = "gpio-keys";
 		joy_sel: joystick_selection {
 			label = "joystick selection";
 			gpios = <&portd 10 GPIO_ACTIVE_LOW>;