diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7.dtsi b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7.dtsi
index c0ea536..4abdaeb 100644
--- a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7.dtsi
+++ b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7.dtsi
@@ -28,12 +28,11 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)                                    RC(4,
 
         diode-direction = "col2row";
         row-gpios
-            = <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            = <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             ;
 
     };
diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
index 0ef5a1e..f10e883 100644
--- a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
+++ b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
@@ -6,12 +6,12 @@
 
 &kscan0 {
     col-gpios
-        = <&gpio1 6 GPIO_ACTIVE_HIGH>
-        , <&gpio1 4 GPIO_ACTIVE_HIGH>
-        , <&gpio0 11 GPIO_ACTIVE_HIGH>
-        , <&gpio1 0 GPIO_ACTIVE_HIGH>
-        , <&gpio0 24 GPIO_ACTIVE_HIGH>
+        = <&gpio0 20 GPIO_ACTIVE_HIGH>
         , <&gpio0 22 GPIO_ACTIVE_HIGH>
-        , <&gpio0 20 GPIO_ACTIVE_HIGH>
+        , <&gpio0 24 GPIO_ACTIVE_HIGH>
+        , <&gpio1 0 GPIO_ACTIVE_HIGH>
+        , <&gpio0 11 GPIO_ACTIVE_HIGH>
+        , <&gpio1 4 GPIO_ACTIVE_HIGH>
+        , <&gpio1 6 GPIO_ACTIVE_HIGH>
         ;
 };