diff --git a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi
index bebad7fa00c..695e522ce6a 100644
--- a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi
+++ b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi
@@ -10,44 +10,36 @@
 
 &pinctrl {
 
-	uart0_tx_gpio21: uart0_tx_gpio21 {
-		pinmux = <UART0_TX_GPIO21>;
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO21>;
+		};
+		group2 {
+			pinmux = <UART0_RX_GPIO20>;
+			bias-pull-up;
+		};
 	};
 
-	uart0_rx_gpio20: uart0_rx_gpio20 {
-		pinmux = <UART0_RX_GPIO20>;
-		bias-pull-up;
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO2>,
+				 <SPIM2_SCLK_GPIO6>,
+				 <SPIM2_CSEL_GPIO10>;
+		};
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO7>;
+			output-low;
+		};
 	};
 
-	spim2_miso_gpio2: spim2_miso_gpio2 {
-		pinmux = <SPIM2_MISO_GPIO2>;
-	};
-
-	spim2_mosi_gpio7: spim2_mosi_gpio7 {
-		pinmux = <SPIM2_MOSI_GPIO7>;
-		output-low;
-	};
-
-	spim2_sclk_gpio6: spim2_sclk_gpio6 {
-		pinmux = <SPIM2_SCLK_GPIO6>;
-	};
-
-	spim2_csel_gpio10: spim2_csel_gpio10 {
-		pinmux = <SPIM2_CSEL_GPIO10>;
-	};
-
-	i2c0_sda_gpio1: i2c0_sda_gpio1 {
-		pinmux = <I2C0_SDA_GPIO1>;
-		bias-pull-up;
-		drive-open-drain;
-		output-high;
-	};
-
-	i2c0_scl_gpio3: i2c0_scl_gpio3 {
-		pinmux = <I2C0_SCL_GPIO3>;
-		bias-pull-up;
-		drive-open-drain;
-		output-high;
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO1>,
+				 <I2C0_SCL_GPIO3>;
+			bias-pull-up;
+			drive-open-drain;
+			output-high;
+		};
 	};
 
 };
diff --git a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.dts b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.dts
index a9f9db21b5c..e1c469c86d6 100644
--- a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.dts
+++ b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.dts
@@ -41,7 +41,7 @@
 &uart0 {
 	status = "okay";
 	current-speed = <115200>;
-	pinctrl-0 = <&uart0_tx_gpio21 &uart0_rx_gpio20>;
+	pinctrl-0 = <&uart0_default>;
 	pinctrl-names = "default";
 };
 
@@ -50,7 +50,7 @@
 	clock-frequency = <I2C_BITRATE_STANDARD>;
 	sda-pin = <1>;
 	scl-pin = <3>;
-	pinctrl-0 = <&i2c0_sda_gpio1 &i2c0_scl_gpio3>;
+	pinctrl-0 = <&i2c0_default>;
 	pinctrl-names = "default";
 };
 
@@ -62,8 +62,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	status = "okay";
-	pinctrl-0 = <&spim2_miso_gpio2 &spim2_mosi_gpio7
-		     &spim2_sclk_gpio6 &spim2_csel_gpio10>;
+	pinctrl-0 = <&spim2_default>;
 	pinctrl-names = "default";
 };
 
diff --git a/samples/basic/blinky_pwm/boards/esp32c3_devkitm.overlay b/samples/basic/blinky_pwm/boards/esp32c3_devkitm.overlay
index 2c34b3f573c..a438cc5246b 100644
--- a/samples/basic/blinky_pwm/boards/esp32c3_devkitm.overlay
+++ b/samples/basic/blinky_pwm/boards/esp32c3_devkitm.overlay
@@ -24,14 +24,16 @@
 };
 
 &pinctrl {
-	ledc0_ch0_gpio2: ledc0_ch0_gpio2 {
-		pinmux = <LEDC_CH0_GPIO2>;
-		output-enable;
+	ledc0_default: ledc0_default {
+		group1 {
+			pinmux = <LEDC_CH0_GPIO2>;
+			output-enable;
+		};
 	};
 };
 
 &ledc0 {
-	pinctrl-0 = <&ledc0_ch0_gpio2>;
+	pinctrl-0 = <&ledc0_default>;
 	pinctrl-names = "default";
 	status = "okay";
 	#address-cells = <1>;