diff --git a/meta-leda-bsp/conf/layer.conf b/meta-leda-bsp/conf/layer.conf
index fbd2985c..4cdff5bf 100644
--- a/meta-leda-bsp/conf/layer.conf
+++ b/meta-leda-bsp/conf/layer.conf
@@ -18,6 +18,12 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+BBFILES_DYNAMIC += "\
+    rauc:${LAYERDIR}/dynamic-layers/linux-yocto/*.bb \
+    rauc:${LAYERDIR}/dynamic-layers/linux-yocto/*.bbappend \
+    raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*.bb \
+    raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*.bbappend"
+
 BBFILE_COLLECTIONS += "meta-leda-bsp"
 BBFILE_PATTERN_meta-leda-bsp := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-leda-bsp = "7"
diff --git a/meta-leda-bsp/dynamic-layers/linux-yocto/files/leda-bsp-rauc.cfg b/meta-leda-bsp/dynamic-layers/linux-yocto/files/leda-bsp-rauc.cfg
new file mode 100644
index 00000000..3fe397f9
--- /dev/null
+++ b/meta-leda-bsp/dynamic-layers/linux-yocto/files/leda-bsp-rauc.cfg
@@ -0,0 +1,15 @@
+# /********************************************************************************
+# * Copyright (c) 2023 Contributors to the Eclipse Foundation
+# *
+# * See the NOTICE file(s) distributed with this work for additional
+# * information regarding copyright ownership.
+# *
+# * This program and the accompanying materials are made available under the
+# * terms of the Apache License 2.0 which is available at
+# * https://www.apache.org/licenses/LICENSE-2.0
+# *
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+# Optimization for qemuarm64
+CONFIG_CRYPTO_SHA256_ARM64=y
diff --git a/meta-leda-bsp/dynamic-layers/linux-yocto/linux-yocto_%.bbappend b/meta-leda-bsp/dynamic-layers/linux-yocto/linux-yocto_%.bbappend
new file mode 100644
index 00000000..fa521db5
--- /dev/null
+++ b/meta-leda-bsp/dynamic-layers/linux-yocto/linux-yocto_%.bbappend
@@ -0,0 +1,16 @@
+# /********************************************************************************
+# * Copyright (c) 2023 Contributors to the Eclipse Foundation
+# *
+# * See the NOTICE file(s) distributed with this work for additional
+# * information regarding copyright ownership.
+# *
+# * This program and the accompanying materials are made available under the
+# * terms of the Apache License 2.0 which is available at
+# * https://www.apache.org/licenses/LICENSE-2.0
+# *
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI:append:qemuarm64 = " file://leda-bsp-rauc.cfg"
diff --git a/meta-leda-bsp/dynamic-layers/raspberry-pi/files/leda-bsp-rauc.cfg b/meta-leda-bsp/dynamic-layers/raspberrypi/files/leda-bsp-raspberrypi-rauc.cfg
similarity index 100%
rename from meta-leda-bsp/dynamic-layers/raspberry-pi/files/leda-bsp-rauc.cfg
rename to meta-leda-bsp/dynamic-layers/raspberrypi/files/leda-bsp-raspberrypi-rauc.cfg
diff --git a/meta-leda-bsp/dynamic-layers/raspberry-pi/linux-raspberrypi_%.bbappend b/meta-leda-bsp/dynamic-layers/raspberrypi/linux-raspberrypi_%.bbappend
similarity index 89%
rename from meta-leda-bsp/dynamic-layers/raspberry-pi/linux-raspberrypi_%.bbappend
rename to meta-leda-bsp/dynamic-layers/raspberrypi/linux-raspberrypi_%.bbappend
index b9c19954..76152c86 100644
--- a/meta-leda-bsp/dynamic-layers/raspberry-pi/linux-raspberrypi_%.bbappend
+++ b/meta-leda-bsp/dynamic-layers/raspberrypi/linux-raspberrypi_%.bbappend
@@ -15,4 +15,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 inherit rauc-integration
 
-SRC_URI:append:rauc-integration = " file://leda-bsp-rauc.cfg"
+SRC_URI:append:rauc-integration = " file://leda-bsp-raspberrypi-rauc.cfg"