diff --git a/.github/workflows/user_config_build.yaml b/.github/workflows/user_config_build.yaml
index f50ea8a..e79af38 100644
--- a/.github/workflows/user_config_build.yaml
+++ b/.github/workflows/user_config_build.yaml
@@ -137,7 +137,12 @@ jobs:
                   sed -i 's/device = <&vtrackball>;/device = <\&trackball>;/g' "$base_config_path/charybdis.keymap"
                   grep "device = <" "$base_config_path/charybdis.keymap"
                   ;;
-              esac            fi
+              esac
+            fi
+
+            # Copy physical layout file to shield directory
+            mv -v "$base_config_path/charybdis-layouts.dtsi" \
+            "${GITHUB_WORKSPACE}/boards/shields/charybdis-${{ env.format }}/"
           fi
 
           # Remove untargeted shields so they don't get auto picked up by the west build command
diff --git a/boards/shields/charybdis-bt/charybdis.dtsi b/boards/shields/charybdis-bt/charybdis.dtsi
index 530fe2c..f8516a1 100644
--- a/boards/shields/charybdis-bt/charybdis.dtsi
+++ b/boards/shields/charybdis-bt/charybdis.dtsi
@@ -1,5 +1,6 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 #include "charybdis-layouts.dtsi"
+
 / {
     // chosen {
     //     zmk,kscan = &kscan0;
diff --git a/boards/shields/charybdis-dongle/charybdis.dtsi b/boards/shields/charybdis-dongle/charybdis.dtsi
index 77fbed0..f8516a1 100644
--- a/boards/shields/charybdis-dongle/charybdis.dtsi
+++ b/boards/shields/charybdis-dongle/charybdis.dtsi
@@ -1,9 +1,14 @@
 #include <dt-bindings/zmk/matrix_transform.h>
+#include "charybdis-layouts.dtsi"
 
 / {
+    // chosen {
+    //     zmk,kscan = &kscan0;
+    //     zmk,matrix_transform = &default_transform;
+    // };
     chosen {
         zmk,kscan = &kscan0;
-        zmk,matrix_transform = &default_transform;
+        zmk,physical-layout = &charybdis-layouts;
     };
 
     vbatt: vbatt {