diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi
index 8934776fa..72814a9e5 100644
--- a/app/boards/shields/kyria/kyria.dtsi
+++ b/app/boards/shields/kyria/kyria.dtsi
@@ -6,11 +6,15 @@
 
 #include "kyria_common.dtsi"
 
-/ {
-    chosen {
-        zmk,matrix-transform = &default_transform;
-    };
+&splitkb_kyria_6col_layout {
+    transform = <&default_transform>;
+};
 
+&splitkb_kyria_5col_layout {
+    transform = <&five_column_transform>;
+};
+
+/ {
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
         columns = <16>;
diff --git a/app/boards/shields/kyria/kyria_common.dtsi b/app/boards/shields/kyria/kyria_common.dtsi
index f662fa1c4..661d1ff50 100644
--- a/app/boards/shields/kyria/kyria_common.dtsi
+++ b/app/boards/shields/kyria/kyria_common.dtsi
@@ -6,11 +6,13 @@
 
 #include <dt-bindings/zmk/matrix_transform.h>
 
+#include "kyria-layout.dtsi"
+
 / {
     chosen {
         zephyr,display = &oled;
         zmk,kscan = &kscan0;
-        zmk,matrix-transform = &default_transform;
+        zmk,physical-layout = &splitkb_kyria_6col_layout;
     };
 
     kscan0: kscan {
diff --git a/app/boards/shields/kyria/kyria_rev2.dtsi b/app/boards/shields/kyria/kyria_rev2.dtsi
index c2586faf9..c1c46bd1a 100644
--- a/app/boards/shields/kyria/kyria_rev2.dtsi
+++ b/app/boards/shields/kyria/kyria_rev2.dtsi
@@ -6,11 +6,15 @@
 
 #include "kyria_common.dtsi"
 
-/ {
-    chosen {
-        zmk,matrix-transform = &default_transform;
-    };
+&splitkb_kyria_6col_layout {
+    transform = <&default_transform>;
+};
 
+&splitkb_kyria_5col_layout {
+    transform = <&five_column_transform>;
+};
+
+/ {
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
         columns = <16>;
diff --git a/app/boards/shields/kyria/kyria_rev3.dtsi b/app/boards/shields/kyria/kyria_rev3.dtsi
index c8cd8df91..333958711 100644
--- a/app/boards/shields/kyria/kyria_rev3.dtsi
+++ b/app/boards/shields/kyria/kyria_rev3.dtsi
@@ -6,11 +6,15 @@
 
 #include "kyria_common.dtsi"
 
-/ {
-    chosen {
-        zmk,matrix-transform = &default_transform;
-    };
+&splitkb_kyria_6col_layout {
+    transform = <&default_transform>;
+};
 
+&splitkb_kyria_5col_layout {
+    status = "disabled";
+};
+
+/ {
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
         columns = <14>;
diff --git a/app/boards/shields/lily58/lily58.dtsi b/app/boards/shields/lily58/lily58.dtsi
index c82b197cc..195ab2b73 100644
--- a/app/boards/shields/lily58/lily58.dtsi
+++ b/app/boards/shields/lily58/lily58.dtsi
@@ -6,11 +6,13 @@
 
 #include <dt-bindings/zmk/matrix_transform.h>
 
+#include <layouts/kata0510/lily58.dtsi>
+
 / {
     chosen {
         zephyr,display = &oled;
         zmk,kscan = &kscan0;
-        zmk,matrix-transform = &default_transform;
+        zmk,physical-layout = &kata0510_lily58_layout;
     };
 
     default_transform: keymap_transform_0 {
@@ -60,6 +62,10 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
     };
 };
 
+&kata0510_lily58_layout {
+    transform = <&default_transform>;
+};
+
 &pro_micro_i2c {
     status = "okay";
 
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
index 93625d28c..b270890d2 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
@@ -6,11 +6,13 @@
 
 #include <dt-bindings/zmk/matrix_transform.h>
 
+#include <layouts/kata0510/lily58.dtsi>
+
 / {
 
     chosen {
         zephyr,display = &oled;
-        zmk,matrix-transform = &default_transform;
+        zmk,physical-layout = &kata0510_lily58_layout;
     };
 
     default_transform: keymap_transform_0 {
@@ -56,6 +58,10 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,1) RC(4,10) RC(3,6) RC(3,7)
     };
 };
 
+&kata0510_lily58_layout {
+    transform = <&default_transform>;
+};
+
 &pro_micro_i2c {
     status = "okay";