diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e70369fc..f46ffc664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,11 +16,17 @@ and this project adheres to
 - Upgrade gstreamer to 1.22.11
 - Fix openssl crash on aarch64 w/o crypto instructions
 - Accomodate llvm in readelf and objdump commands in oe packaging
+- Enable OPTEE for var-som-mx8 project
+- Upgrade Golang to 1.22.2
+- Upgrade webkit to 2.44.0
+- Fix ptests for several meta-python recipes
+- Update QT6 to latest 6.7
+- Upgrade clang compiler to 18.1.3
 
 ### Added
 
 - New Recipes
-  - highway, libjxl, python-libusb1
+  - highway, libjxl, python-libusb1, libfido2, avro-c++
 
 ### Removed
 
diff --git a/conf/projects/var-som-mx8/config.conf b/conf/projects/var-som-mx8/config.conf
index dcbec0dd1..18efefab1 100644
--- a/conf/projects/var-som-mx8/config.conf
+++ b/conf/projects/var-som-mx8/config.conf
@@ -38,6 +38,12 @@ IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line
 #####################################################################
+# Enable optee see
+# https://variwiki.com/index.php?title=IMX8_OPTEE&release=mx8mp-yocto-mickledore-6.1.36_2.1.0-v1.2
+MACHINE_FEATURES:append = " optee"
+DISTRO_FEATURES:append = " optee"
+IMAGE_INSTALL:append = " optee-os"
+
 #require conf/distro/include/lto.inc
 #DISTRO_FEATURES:append = " lto"
 
diff --git a/envsetup.sh b/envsetup.sh
index 539dd86ed..de2378cd3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -119,10 +119,10 @@ fi
 export PROJECT
 echo "Setting PROJECT=$PROJECT"
 
-MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d '"' -f 2`
+MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE[[:space:]]*=' | cut -d '"' -f 2`
 
 if [ -z "$MACHINE" ]; then
-  MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d "'" -f 2`
+  MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE[[:space:]]*=' | cut -d "'" -f 2`
 fi
 
 if [ -z "$MACHINE" ]; then
diff --git a/sources/meta-clang b/sources/meta-clang
index 73c00a5a0..13dcab852 160000
--- a/sources/meta-clang
+++ b/sources/meta-clang
@@ -1 +1 @@
-Subproject commit 73c00a5a0bebc871854e43cc1f0fe5bd5e5ad1d7
+Subproject commit 13dcab852c5bcd51fd75ae84ace9eddd99254653
diff --git a/sources/meta-freescale b/sources/meta-freescale
index 19d33d87a..4968b000d 160000
--- a/sources/meta-freescale
+++ b/sources/meta-freescale
@@ -1 +1 @@
-Subproject commit 19d33d87a3f5bd836ee472f207f20c4e126a7d6b
+Subproject commit 4968b000daa74e959da40ed6fccd25a22eb39f61
diff --git a/sources/meta-openembedded b/sources/meta-openembedded
index a6bcdca5b..5a02b76b8 160000
--- a/sources/meta-openembedded
+++ b/sources/meta-openembedded
@@ -1 +1 @@
-Subproject commit a6bcdca5b4681906b00e12f6bc4af465c85bad9f
+Subproject commit 5a02b76b82d1f48986212c33dddf7986385c79ef
diff --git a/sources/meta-qt6 b/sources/meta-qt6
index aa2a2ceff..2828a1138 160000
--- a/sources/meta-qt6
+++ b/sources/meta-qt6
@@ -1 +1 @@
-Subproject commit aa2a2ceffb06f3306d02725143f3f51304468ea3
+Subproject commit 2828a11384f6b5b17f2aa6d3114cf4aa1937d579
diff --git a/sources/meta-variscite-bsp b/sources/meta-variscite-bsp
index e73625314..5230637da 160000
--- a/sources/meta-variscite-bsp
+++ b/sources/meta-variscite-bsp
@@ -1 +1 @@
-Subproject commit e7362531418428ac7fdc377b611e5f710e3a9754
+Subproject commit 5230637da4bf3f4eab2a37d86d871de09c89514f
diff --git a/sources/poky b/sources/poky
index 30d88a204..110ee701b 160000
--- a/sources/poky
+++ b/sources/poky
@@ -1 +1 @@
-Subproject commit 30d88a20432d2ddca555c9b6690450b260e523ec
+Subproject commit 110ee701b33600f14e40544bf9354774cd85c5ce