diff --git a/config/boards/arm/egokb_control/egokb_control.dts b/config/boards/arm/egokb_control/egokb_control.dts
index c3d2178..28f2342 100644
--- a/config/boards/arm/egokb_control/egokb_control.dts
+++ b/config/boards/arm/egokb_control/egokb_control.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include "egokb_control_pinctrl.dtsi"
 #include <dt-bindings/led/led.h>
 #include <dt-bindings/zmk/matrix_transform.h>
 
@@ -83,14 +84,17 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6)   RC(4,7) RC(4,8) RC(4,9
 
 &i2c0 {
     compatible = "nordic,nrf-twi";
-    sda-pin = <30>;
-    scl-pin = <31>;
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &uart0 {
     compatible = "nordic,nrf-uarte";
-    tx-pin = <6>;
-	rx-pin = <8>;
+    current-speed = <115200>;
+    pinctrl-0 = <&uart0_default>;
+    pinctrl-1 = <&uart0_sleep>;
+    pinctrl-names = "default", "sleep";
 };
 
 &usbd {
diff --git a/config/boards/arm/egokb_control/egokb_control_pinctrl.dtsi b/config/boards/arm/egokb_control/egokb_control_pinctrl.dtsi
new file mode 100644
index 0000000..ea52a66
--- /dev/null
+++ b/config/boards/arm/egokb_control/egokb_control_pinctrl.dtsi
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+&pinctrl {
+    uart0_default: uart0_default {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>;
+            bias-pull-up;
+        };
+        group2 {
+            psels = <NRF_PSEL(UART_TX, 0, 6)>;
+        };
+    };
+
+    uart0_sleep: uart0_sleep {
+        group1 {
+            psels = <NRF_PSEL(UART_RX, 0, 8)>,
+                    <NRF_PSEL(UART_TX, 0, 6)>;
+            low-power-enable;
+        };
+    };
+
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 31)>;
+        };
+    };
+
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 31)>;
+            low-power-enable;
+        };
+    };
+};
\ No newline at end of file