diff --git a/app/boards/shields/wing36/wing36_left.conf b/app/boards/shields/wing36/wing36_left.conf
new file mode 100644
index 00000000..dcb30ef6
--- /dev/null
+++ b/app/boards/shields/wing36/wing36_left.conf
@@ -0,0 +1 @@
+# wing36_left.conf
\ No newline at end of file
diff --git a/app/boards/shields/wing36/wing36_left.overlay b/app/boards/shields/wing36/wing36_left.overlay
new file mode 100644
index 00000000..483db8ff
--- /dev/null
+++ b/app/boards/shields/wing36/wing36_left.overlay
@@ -0,0 +1 @@
+#include "wing36.dtsi"
\ No newline at end of file
diff --git a/app/boards/shields/wing36/wing36_right.conf b/app/boards/shields/wing36/wing36_right.conf
new file mode 100644
index 00000000..a6080a55
--- /dev/null
+++ b/app/boards/shields/wing36/wing36_right.conf
@@ -0,0 +1 @@
+# wing36_right.conf
\ No newline at end of file
diff --git a/app/boards/shields/wing36/wing36_right.overlay b/app/boards/shields/wing36/wing36_right.overlay
new file mode 100644
index 00000000..f264812e
--- /dev/null
+++ b/app/boards/shields/wing36/wing36_right.overlay
@@ -0,0 +1,24 @@
+#include "wing36.dtsi"
+
+&kscan0 {
+  input-gpios
+  = <&pro_micro  1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+  ;
+};
\ No newline at end of file