diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ca3af95d..402f869d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@ and this project adheres to
 - Bump libcamera-apps to latest
 - Do not use internal assembler with clang for qtbase
 - Restart yoe-kiosk-browser service on failure
-- Update linux-yocto/6.4 to v6.4.9
+- Update linux-yocto/6.4 to v6.4.11 and 6.1 to v6.1.46
 - Pass /dev/vhost-net to build container from envsetup
 - Upgrade openssh to 9.3p2
 - Upgrade go compiler to 1.20.7
@@ -54,6 +54,8 @@ and this project adheres to
 - Fix unnessary clang rebuild when enabling MULTILIBS
 - Add ptests to librelp and run them by default in meta-oe ptest image
 - Upgrade mariadb to 10.11.5
+- Fix musl build for riscv32
+- Allow building some native recipes with ccache
 
 ### Added
 
diff --git a/envsetup.sh b/envsetup.sh
index b760e760f..77b69d430 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -689,7 +689,7 @@ yoe_get_image_version() {
 yoe_check_install_dependencies() {
   if ! command -v bmaptool >&/dev/null; then
     # build own copy of native tools
-    bitbake build-sysroots
+    bitbake bmap-tools-native build-sysroots
     if ! command -v bmaptool >&/dev/null; then
       echo "bmaptool not installed"
       echo "Install bmap-tools package on build host"
@@ -740,5 +740,6 @@ yoe_install_image() {
 
 # Needed for running per-image ptest images in parallel on qemu
 yoe_create_tap_devices() {
-  sudo runqemu-gen-tapdevs `id -u` ` nproc --all`
+  bitbake qemu-helper-native
+  sudo ${OE_BASE}/sources/poky/scripts/runqemu-gen-tapdevs `id -u` ` nproc --all`
 }
diff --git a/sources/meta-arm b/sources/meta-arm
index 2ac07293a..3297357d4 160000
--- a/sources/meta-arm
+++ b/sources/meta-arm
@@ -1 +1 @@
-Subproject commit 2ac07293aa36019577562213f321f36d6fcfd316
+Subproject commit 3297357d48c4f76fde344f68238d5d6c32a0a914
diff --git a/sources/meta-freescale b/sources/meta-freescale
index 863c81179..e4d721f73 160000
--- a/sources/meta-freescale
+++ b/sources/meta-freescale
@@ -1 +1 @@
-Subproject commit 863c8117920280d922d48efbce3ffdc4318d5526
+Subproject commit e4d721f735aba27f0f1a478dba1b28f738cd1e9d
diff --git a/sources/meta-intel b/sources/meta-intel
index 7368b9654..068533789 160000
--- a/sources/meta-intel
+++ b/sources/meta-intel
@@ -1 +1 @@
-Subproject commit 7368b9654e181ab0f3214df2cf40328f54237109
+Subproject commit 068533789330a35320cefa8bfbae180d4aea19f8
diff --git a/sources/meta-riscv b/sources/meta-riscv
index 97609a3d4..e44ef794e 160000
--- a/sources/meta-riscv
+++ b/sources/meta-riscv
@@ -1 +1 @@
-Subproject commit 97609a3d454da9bb0281193e8005151590723837
+Subproject commit e44ef794e889d6610716657a5bb09f627d3e4356
diff --git a/sources/poky b/sources/poky
index b08a06a5b..92983dba6 160000
--- a/sources/poky
+++ b/sources/poky
@@ -1 +1 @@
-Subproject commit b08a06a5bb4a862c00d8273d5c57fa847fdedb00
+Subproject commit 92983dba651cffe5c11973d90aad00c581a79c93