diff --git a/boards/shields/waffle-34k/waffle-34k.keymap b/boards/shields/waffle-34k/waffle-34k.keymap
index c6897b4..30598be 100644
--- a/boards/shields/waffle-34k/waffle-34k.keymap
+++ b/boards/shields/waffle-34k/waffle-34k.keymap
@@ -14,10 +14,10 @@
 // |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  |
 //                    | GUI | LWR | SPC |   | ENT | RSE  | ALT |
                         bindings = <
-   &kp Q &kp W &kp F &kp P &kp B   &kp J &kp L  &kp U     &kp Y   &kp SEMI   
-   &kp A &kp R &kp S &kp T &kp G   &kp N &kp M  &kp E     &kp I   &kp O
-   &kp X &kp C &kp D &kp V &kp Z   &kp K &kp H  &kp COMMA &kp DOT &kp FSLH
-                  &kp LGUI &mo 1 &kp SPACE   &kp RET &mo 2 &kp RALT
+   &kp Q &kp W &kp F &kp P    &kp B   &kp J       &kp L   &kp U     &kp Y   &kp SEMI   
+   &kp A &kp R &kp S &kp T    &kp G   &kp M       &kp N   &kp E     &kp I   &kp O
+   &kp X &kp C &kp D &kp V    &kp Z   &kp K       &kp H   &kp COMMA &kp DOT &kp FSLH
+                     &kp RET &mo TAB  &kp SPACE  &kp ENT  
                         >;
                 };
         };
diff --git a/boards/shields/waffle-34k/waffle-34k.overlay b/boards/shields/waffle-34k/waffle-34k.overlay
index cb90141..1b41acd 100644
--- a/boards/shields/waffle-34k/waffle-34k.overlay
+++ b/boards/shields/waffle-34k/waffle-34k.overlay
@@ -16,16 +16,16 @@
                     <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>,
                     <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 
-        col-gpios = <&pro_micro 1 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 0 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 2 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 3 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 4 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 5 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 6 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 7 (GPIO_ACTIVE_HIGH)>,
+        col-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH)>,
                     <&pro_micro 8 (GPIO_ACTIVE_HIGH)>,
-                    <&pro_micro 9 (GPIO_ACTIVE_HIGH)>;
+                    <&pro_micro 7 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 6 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 5 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 4 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 3 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 2 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 0 (GPIO_ACTIVE_HIGH)>,
+                    <&pro_micro 1 (GPIO_ACTIVE_HIGH)>;
     };
 
     transform: matrix_transform {