diff --git a/conf/machine/include/rpi.inc b/conf/machine/include/rpi.inc
index 96295748..642991f4 100644
--- a/conf/machine/include/rpi.inc
+++ b/conf/machine/include/rpi.inc
@@ -43,4 +43,4 @@ OMNECT_BOOTLOADER_RECIPE_PATH = "${LAYERDIR_core}/recipes-bsp/u-boot/u-boot_2024
 # OMNECT_BOOTLOADER_CHECKSUM_EXPTECTED:pn-bootloader-versioned - build will fail, if the
 # computed checksum is different to this; set to <oldchecksum> when
 # OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned is set
-OMNECT_BOOTLOADER_CHECKSUM_EXPECTED:pn-bootloader-versioned = "54427f35455ec78e480e7d2407a9c510cd975159d76c125fd82e66f17f5848bf"
+OMNECT_BOOTLOADER_CHECKSUM_EXPECTED:pn-bootloader-versioned = "0a28102f487988548315da27e3fada50c138656acdd3866f818743831ed74c35"
diff --git a/dynamic-layers/raspberrypi/recipes-bsp/bootloader-versioned/bootloader-versioned.bbappend b/dynamic-layers/raspberrypi/recipes-bsp/bootloader-versioned/bootloader-versioned.bbappend
index d1f5d426..62c0370e 100644
--- a/dynamic-layers/raspberrypi/recipes-bsp/bootloader-versioned/bootloader-versioned.bbappend
+++ b/dynamic-layers/raspberrypi/recipes-bsp/bootloader-versioned/bootloader-versioned.bbappend
@@ -1,4 +1,5 @@
 OMNECT_BOOTLOADER_CHECKSUM_FILES += "${LAYERDIR_core}/recipes-bsp/u-boot/u-boot-common.inc"
+OMNECT_BOOTLOADER_CHECKSUM_FILES += "${LAYERDIR_core}/recipes-bsp/u-boot/files/*"
 OMNECT_BOOTLOADER_CHECKSUM_FILES += "${LAYERDIR_omnect}/dynamic-layers/raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend"
 OMNECT_BOOTLOADER_CHECKSUM_FILES += "${LAYERDIR_omnect}/dynamic-layers/raspberrypi/recipes-bsp/u-boot/u-boot/*"
 # the u-boot_%.bbappend from meta-raspberrypi is part of BBMASK and thus not part of OMNECT_BOOTLOADER_CHECKSUM_FILES
diff --git a/kas/distro/oe.yaml b/kas/distro/oe.yaml
index ac3eb651..081806b5 100644
--- a/kas/distro/oe.yaml
+++ b/kas/distro/oe.yaml
@@ -6,15 +6,15 @@ repos:
   ext/bitbake:
     url: "https://git.openembedded.org/bitbake"
     branch: "2.8"
-    # tag yocto-5.0.17
-    commit: "d3b4c352dd33fca90cd31649eda054b884478739"
+    # tag yocto-5.0.18
+    commit: "82abbfcdbda949851a03bb2cb2049ea689564ad6"
     layers:
       .: 0
   ext/_openembedded-core: #_ prefixed because of layer order with same prio e.g. meta-openembedded
     url: "https://git.openembedded.org/openembedded-core"
     branch: "scarthgap"
-    # tag yocto-5.0.17
-    commit: "52380df998b3a8fe6a091f8547434a3231320a8e"
+    # tag yocto-5.0.18
+    commit: "ece80784b493c8b7493478fa2ba0dc1d6d80aa79"
     layers:
       meta:
     patches:
@@ -22,4 +22,4 @@ repos:
         repo: "meta-omnect"
         path: "kas/patches/oe.patch"
 env:
-  OE_VERSION: "5.0.17"
+  OE_VERSION: "5.0.18"
diff --git a/kas/distro/omnect-os.yaml b/kas/distro/omnect-os.yaml
index 860b33ab..065fc0f7 100644
--- a/kas/distro/omnect-os.yaml
+++ b/kas/distro/omnect-os.yaml
@@ -10,7 +10,7 @@ repos:
   ext/meta-openembedded:
     url: "https://github.com/openembedded/meta-openembedded.git"
     branch: "scarthgap"
-    commit: "5124ac4a658899158f4a7a2ddf1d2ca931ec7d0e"
+    commit: "d8cc4e44001c7257273d290ce8c4496e93d32841"
     layers:
       # meta-multimedia is used by qemu_8.2.2.imx.bb (tauri) ToDo: possible to handle that in the machine specific kas file?
       meta-multimedia:
@@ -34,11 +34,11 @@ repos:
   ext/meta-swupdate:
     url: "https://github.com/sbabic/meta-swupdate.git"
     branch: "scarthgap"
-    commit: "a329ea9f9ef4eeb316f2da2dba4a9c1bcb106899"
+    commit: "cb709b865a56be48cb17cbad149b69f793f3888b"
   ext/meta-virtualization:
     url: "https://git.yoctoproject.org/meta-virtualization"
     branch: "scarthgap"
-    commit: "3dd635f613f7299d986a8ab6bc9f584370f8ed1d"
+    commit: "89da4f56b4c510059f8dc1527d289d9fd4fef133"
     patches:
       p001:
         repo: "meta-omnect"
diff --git a/kas/machine/rpi/rpi.yaml b/kas/machine/rpi/rpi.yaml
index 46e75e5f..e16d1088 100644
--- a/kas/machine/rpi/rpi.yaml
+++ b/kas/machine/rpi/rpi.yaml
@@ -7,7 +7,7 @@ repos:
   ext/meta-raspberrypi:
     url: "https://github.com/agherzan/meta-raspberrypi.git"
     branch: "scarthgap"
-    commit: "2c646d29912dcc873469a57b1c207e1549c5094d"
+    commit: "167703d5618498bb7feeaedf18e61be7a8246d1b"
     patches:
       p001:
         repo: "meta-omnect"
diff --git a/kas/machine/x86_64/genericx86-64.yaml b/kas/machine/x86_64/genericx86-64.yaml
index 5b3f261d..4453f7d1 100644
--- a/kas/machine/x86_64/genericx86-64.yaml
+++ b/kas/machine/x86_64/genericx86-64.yaml
@@ -7,7 +7,7 @@ repos:
   ext/meta-yocto-bsp:
     url: "https://git.yoctoproject.org/meta-yocto"
     branch: scarthgap
-    commit: "c7c38663a1cafb1fa8593c0b246811e51d3bbe20"
+    commit: "ca5a51aadaf651881d640688dc3e1e123aa30bf6"
     layers:
       meta-yocto-bsp:
   ext/meta-secure-core:
@@ -25,7 +25,7 @@ repos:
   ext/meta-perl:
     url: "https://github.com/openembedded/meta-openembedded.git"
     branch: "scarthgap"
-    commit: "5124ac4a658899158f4a7a2ddf1d2ca931ec7d0e"
+    commit: "d8cc4e44001c7257273d290ce8c4496e93d32841"
     layers:
       meta-perl: