diff --git a/conf/layer.conf b/conf/layer.conf
index 78d4c4e..09b062c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,22 +5,30 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-opi-diya"
-BBFILE_PATTERN_meta-opi-diya = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-opi-diya = "11"
+BBFILE_COLLECTIONS += "meta-pinephone-diya"
+BBFILE_PATTERN_meta-pinephone-diya = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-pinephone-diya = "11"
 
-LAYERDEPENDS_meta-opi-diya = " core "
-LAYERSERIES_COMPAT_meta-opi-diya = "scarthgap"
+LAYERDEPENDS_meta-pinephone-diya = " core "
+LAYERSERIES_COMPAT_meta-pinephone-diya = "walnascar"
 
 MACHINE ?= "pinephone"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-megi"
-PREFERRED_VERSION_linux-megi = "6.15"
+PREFERRED_VERSION_linux-megi = "6.15.0"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-megous"
 PREFERRED_PROVIDER_u-boot = "u-boot-megous"
 
-# 
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross-${TARGET_ARCH}"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}"
+#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
+#PREFERRED_PROVIDER_gdb = "gdb"
+
+#PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils ?= "binutils-crosssdk-${SDK_SYS}"
+#PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}"
+#PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}"
+#PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
 
 # extra kernel CMDLINE_RNDIS option
 # CMDLINE_RNDIS += " video=DPI-1:480x640,rotate=90 "
diff --git a/recipes-bsp/atf/atf-50i-a64_git.bb b/recipes-bsp/atf/atf-50i-a64_git.bb
index b8873a9..482301d 100644
--- a/recipes-bsp/atf/atf-50i-a64_git.bb
+++ b/recipes-bsp/atf/atf-50i-a64_git.bb
@@ -8,7 +8,7 @@ SRCREV = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122"
 
 # v2.9
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 COMPATIBLE_MACHINE = "(sun50i|sun50i-a64)"
diff --git a/recipes-bsp/u-boot/u-boot-megous.bb b/recipes-bsp/u-boot/u-boot-megous.bb
index bb6c589..54a1f11 100644
--- a/recipes-bsp/u-boot/u-boot-megous.bb
+++ b/recipes-bsp/u-boot/u-boot-megous.bb
@@ -29,7 +29,7 @@ PV = "v2025.01+git${SRCPV}"
 
 SRCREV = "${AUTOREV}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -51,6 +51,6 @@ do_configure() {
 do_compile() {
 	oe_runmake
 	oe_runmake u-boot-initial-env
-    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
+    ${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${S}/${UBOOT_ENV_BINARY}
 }
 
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa.bbappend
similarity index 100%
rename from recipes-graphics/mesa/mesa_%.bbappend
rename to recipes-graphics/mesa/mesa.bbappend
diff --git a/recipes-kernel/linux/files/0217-arm64-dts-allwinner-a64-Add-hdmi-sound-card.patch b/recipes-kernel/linux/files/0217-arm64-dts-allwinner-a64-Add-hdmi-sound-card.patch
index aed875c..d935ec2 100644
--- a/recipes-kernel/linux/files/0217-arm64-dts-allwinner-a64-Add-hdmi-sound-card.patch
+++ b/recipes-kernel/linux/files/0217-arm64-dts-allwinner-a64-Add-hdmi-sound-card.patch
@@ -3,8 +3,11 @@ From: Jernej Skrabec <jernej.skrabec@gmail.com>
 Date: Sun, 9 May 2021 10:39:56 +0200
 Subject: [PATCH 217/484] arm64: dts: allwinner: a64: Add hdmi sound card
 
+
 A64 supports HDMI audio. Add a sound card node for it.
 
+Upstream-Status: Pending
+
 Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
 ---
  arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 15 +++++++++++++++
diff --git a/recipes-kernel/linux/linux-megi_6.15.bb b/recipes-kernel/linux/linux-megi_6.15.0.bb
similarity index 89%
rename from recipes-kernel/linux/linux-megi_6.15.bb
rename to recipes-kernel/linux/linux-megi_6.15.0.bb
index ddc1dac..7e7b448 100644
--- a/recipes-kernel/linux/linux-megi_6.15.bb
+++ b/recipes-kernel/linux/linux-megi_6.15.0.bb
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRCREV_machine = "${AUTOREV}"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(sun50i)"
 
 LINUX_PINEPHONE_BRANCH ?= "pp-6.15"
 
 SRC_URI = " \
-    git://codeberg.org/megi/linux.git;name=machine;branch=${LINUX_PINEPHONE_BRANCH};protocol=https \
+    git://codeberg.org/megi/linux.git;branch=${LINUX_PINEPHONE_BRANCH};protocol=https \
     file://defconfig \
     file://0217-arm64-dts-allwinner-a64-Add-hdmi-sound-card.patch \
     "
@@ -26,7 +26,7 @@ inherit kernel
 require linux.inc
  
 LINUX_VERSION ?= "${PV}"
-S = "${WORKDIR}/linux-${PV}"
+S = "${UNPACKDIR}/git"
 
 do_deploy:append() {
     install -d ${DEPLOY_DIR_IMAGE}
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 95d9ec1..540687f 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -1,6 +1,5 @@
 DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
-LICENSE = "GPLv2"
 
 INC_PR = "r0"
 
@@ -35,8 +34,8 @@ kernel_conf_variable() {
     fi
 }
 
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/cross-binutils:do_populate_sysroot"
+do_kernel_configme[depends] += "gcc-cross-${TARGET_ARCH}:do_populate_sysroot"
 do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
 
 do_configure:prepend() {
@@ -45,8 +44,8 @@ do_configure:prepend() {
     #
     # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
     #
-    if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
-        install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+    if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
+        install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
         kernel_conf_variable LOGO y
         kernel_conf_variable LOGO_LINUX_CLUT224 y
     fi
diff --git a/recipes-kernel/pinephone-firmware/pinephone-firmware.bb b/recipes-kernel/pinephone-firmware/pinephone-firmware.bb
index 86619fc..2ea8680 100644
--- a/recipes-kernel/pinephone-firmware/pinephone-firmware.bb
+++ b/recipes-kernel/pinephone-firmware/pinephone-firmware.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "UWE5622 Wifi firmware"
 LICENSE = "CC0-1.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 COMPATIBLE_MACHINE = "pinephone"