diff --git a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb-pinctrl.dtsi b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb-pinctrl.dtsi
index b3b10d0ff3..43135628b6 100644
--- a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb-pinctrl.dtsi
+++ b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb-pinctrl.dtsi
@@ -9,48 +9,39 @@
 #include <zephyr/dt-bindings/pinctrl/esp32-gpio-sigmap.h>
 
 &pinctrl {
-	uart0_tx_gpio1: uart0_tx_gpio1 {
-		pinmux = <UART0_TX_GPIO1>;
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO1>,
+				 <UART0_RX_GPIO3>;
+		};
 	};
 
-	uart0_rx_gpio3: uart0_rx_gpio3 {
-		pinmux = <UART0_RX_GPIO3>;
+	uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TX_GPIO4>,
+				 <UART1_RX_GPIO36>;
+		};
 	};
 
-	uart1_tx_gpio4: uart1_tx_gpio4 {
-		pinmux = <UART1_TX_GPIO4>;
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SCL_GPIO16>,
+				 <I2C0_SDA_GPIO13>;
+			drive-open-drain;
+			output-high;
+		};
 	};
 
-	uart1_rx_gpio36: uart1_rx_gpio36 {
-		pinmux = <UART1_RX_GPIO36>;
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO15>,
+				 <SPIM2_SCLK_GPIO14>,
+				 <SPIM2_CSEL_GPIO17>;
+		};
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO2>;
+			output-low;
+		};
 	};
 
-	i2c0_scl_gpio16: i2c0_scl_gpio16 {
-		pinmux = <I2C0_SCL_GPIO16>;
-		drive-open-drain;
-		output-high;
-	};
-
-	i2c0_sda_gpio13: i2c0_sda_gpio13 {
-		pinmux = <I2C0_SDA_GPIO13>;
-		drive-open-drain;
-		output-high;
-	};
-
-	spim2_miso_gpio15: spim2_miso_gpio15 {
-		pinmux = <SPIM2_MISO_GPIO15>;
-	};
-
-	spim2_mosi_gpio2: spim2_mosi_gpio2 {
-		pinmux = <SPIM2_MOSI_GPIO2>;
-		output-low;
-	};
-
-	spim2_sclk_gpio14: spim2_sclk_gpio14 {
-		pinmux = <SPIM2_SCLK_GPIO14>;
-	};
-
-	spim2_csel_gpio17: spim2_csel_gpio17 {
-		pinmux = <SPIM2_CSEL_GPIO17>;
-	};
 };
diff --git a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.dts b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.dts
index 7cdc2a21b6..d2389a64c1 100644
--- a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.dts
+++ b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb.dts
@@ -66,14 +66,14 @@ uext_spi: &spi2 {};
 &uart0 {
 	status = "okay";
 	current-speed = <115200>;
-	pinctrl-0 = <&uart0_tx_gpio1 &uart0_rx_gpio3>;
+	pinctrl-0 = <&uart0_default>;
 	pinctrl-names = "default";
 };
 
 &uart1 {
 	status = "okay";
 	current-speed = <115200>;
-	pinctrl-0 = <&uart1_tx_gpio4 &uart1_rx_gpio36>;
+	pinctrl-0 = <&uart1_default>;
 	pinctrl-names = "default";
 };
 
@@ -82,14 +82,13 @@ uext_spi: &spi2 {};
 	clock-frequency = <I2C_BITRATE_STANDARD>;
 	sda-pin = <16>;
 	scl-pin = <13>;
-	pinctrl-0 = <&i2c0_scl_gpio16 &i2c0_sda_gpio13>;
+	pinctrl-0 = <&i2c0_default>;
 	pinctrl-names = "default";
 };
 
 &spi2 {
 	status = "okay";
-	pinctrl-0 = <&spim2_miso_gpio15 &spim2_mosi_gpio2
-		     &spim2_sclk_gpio14 &spim2_csel_gpio17>;
+	pinctrl-0 = <&spim2_default>;
 	pinctrl-names = "default";
 	#address-cells = <1>;
 	#size-cells = <0>;