diff --git a/board/czechlight/common/overlay/etc/modules-load.d/usb-serial-gadget.conf b/board/czechlight/beaglebone/overlay/etc/modules-load.d/usb-serial-gadget.conf
similarity index 100%
rename from board/czechlight/common/overlay/etc/modules-load.d/usb-serial-gadget.conf
rename to board/czechlight/beaglebone/overlay/etc/modules-load.d/usb-serial-gadget.conf
diff --git a/board/czechlight/common/overlay/etc/systemd/system/getty.target.wants/serial-getty@ttyGS0.service b/board/czechlight/beaglebone/overlay/etc/systemd/getty.target.wants/serial-getty@ttyGS0.service
similarity index 100%
rename from board/czechlight/common/overlay/etc/systemd/system/getty.target.wants/serial-getty@ttyGS0.service
rename to board/czechlight/beaglebone/overlay/etc/systemd/getty.target.wants/serial-getty@ttyGS0.service
diff --git a/configs/czechlight_beaglebone_defconfig b/configs/czechlight_beaglebone_defconfig
index 37d2abe..57fd836 100644
--- a/configs/czechlight_beaglebone_defconfig
+++ b/configs/czechlight_beaglebone_defconfig
@@ -11,7 +11,7 @@
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/overlay/"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/overlay/ $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y