diff --git a/conf/layer.conf b/conf/layer.conf
index 6a518cb..1c5ef89 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERVERSION_pinecube-bsp = "2"
 
 
 LAYERDEPENDS_pinecube-bsp = "core sunxi-bsp"
-LAYERSERIES_COMPAT_pinecube-bsp = "mickledore"
+LAYERSERIES_COMPAT_pinecube-bsp = "scarthgap"
diff --git a/conf/machine/pinecube.conf b/conf/machine/pinecube.conf
index 722c5f0..f6023d2 100644
--- a/conf/machine/pinecube.conf
+++ b/conf/machine/pinecube.conf
@@ -22,8 +22,8 @@ MACHINE_FEATURES = "ext2 rtc serial usbhost vfat wifi"
 
 # Kernel and device tree
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
-PREFERRED_VERSION_virtual/kernel = "6.1%"
-KERNEL_DEVICETREE = "sun8i-s3-pinecube.dtb"
+PREFERRED_VERSION_virtual/kernel = "6.6%"
+KERNEL_DEVICETREE = "allwinner/sun8i-s3-pinecube.dtb"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
 
 # Serial console
diff --git a/recipes-bsp/u-boot/u-boot-script_1.0.bb b/recipes-bsp/u-boot/u-boot-script_1.0.bb
index 70d39a3..a29b4d0 100644
--- a/recipes-bsp/u-boot/u-boot-script_1.0.bb
+++ b/recipes-bsp/u-boot/u-boot-script_1.0.bb
@@ -23,11 +23,11 @@ addtask mkimage after do_compile before do_install
 do_compile[noexec] = "1"
 
 do_install () {
-	install -D -m 644 ${B}/boot.scr ${D}boot/boot.scr
+	install -D -m 644 ${B}/boot.scr ${D}/boot/boot.scr
 }
 
 do_deploy () {
-	install -D -m 644 ${D}boot/boot.scr ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
+	install -D -m 644 ${D}/boot/boot.scr ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
 
 	cd ${DEPLOYDIR}
 	rm -f boot.scr
diff --git a/recipes-kernel/linux/linux-yocto/0001-pinecube-dts-fix-ir-leds.patch b/recipes-kernel/linux/linux-yocto/0001-pinecube-dts-fix-ir-leds.patch
index 5a69865..44a007d 100644
--- a/recipes-kernel/linux/linux-yocto/0001-pinecube-dts-fix-ir-leds.patch
+++ b/recipes-kernel/linux/linux-yocto/0001-pinecube-dts-fix-ir-leds.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -25,12 +25,12 @@ leds {
  
  		led1 {
diff --git a/recipes-kernel/linux/linux-yocto/0002-pinecube-dts-battery.patch b/recipes-kernel/linux/linux-yocto/0002-pinecube-dts-battery.patch
index 8509674..a5b4f35 100644
--- a/recipes-kernel/linux/linux-yocto/0002-pinecube-dts-battery.patch
+++ b/recipes-kernel/linux/linux-yocto/0002-pinecube-dts-battery.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -162,6 +162,10 @@ &ac_power_supply {
  	status = "okay";
  };
diff --git a/recipes-kernel/linux/linux-yocto/0003-pinecube-dts-flash-xtx.patch b/recipes-kernel/linux/linux-yocto/0003-pinecube-dts-flash-xtx.patch
index 5d9ad4a..94785a4 100644
--- a/recipes-kernel/linux/linux-yocto/0003-pinecube-dts-flash-xtx.patch
+++ b/recipes-kernel/linux/linux-yocto/0003-pinecube-dts-flash-xtx.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -207,7 +207,7 @@ &spi0 {
  	flash@0 {
  		#address-cells = <1>;
diff --git a/recipes-kernel/linux/linux-yocto/0004-pinecube-dts-usb.patch b/recipes-kernel/linux/linux-yocto/0004-pinecube-dts-usb.patch
index b0f373a..d4a6a7f 100644
--- a/recipes-kernel/linux/linux-yocto/0004-pinecube-dts-usb.patch
+++ b/recipes-kernel/linux/linux-yocto/0004-pinecube-dts-usb.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -75,6 +75,18 @@ csi1_ep: endpoint {
  	};
  };
diff --git a/recipes-kernel/linux/linux-yocto/0005-pinecube-dts-csi.patch b/recipes-kernel/linux/linux-yocto/0005-pinecube-dts-csi.patch
index d89b0c9..007226e 100644
--- a/recipes-kernel/linux/linux-yocto/0005-pinecube-dts-csi.patch
+++ b/recipes-kernel/linux/linux-yocto/0005-pinecube-dts-csi.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -64,6 +64,8 @@ &csi1 {
  	status = "okay";
  
diff --git a/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-audio.patch b/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-audio.patch
index 3b7964f..b61f9e2 100644
--- a/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-audio.patch
+++ b/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-audio.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -226,3 +226,16 @@ &usbphy {
  	usb0_vbus-supply = <&reg_vcc5v0>;
  	status = "okay";
diff --git a/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-axp209.patch b/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-axp209.patch
index efd5109..4a87c75 100644
--- a/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-axp209.patch
+++ b/recipes-kernel/linux/linux-yocto/0006-pinecube-dts-axp209.patch
@@ -1,6 +1,6 @@
-diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
---- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
-+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
+diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
+--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
 @@ -99,9 +99,13 @@ &i2c0 {
  	status = "okay";
  
diff --git a/recipes-kernel/linux/linux-yocto_6.1%.bbappend b/recipes-kernel/linux/linux-yocto_6.6%.bbappend
similarity index 100%
rename from recipes-kernel/linux/linux-yocto_6.1%.bbappend
rename to recipes-kernel/linux/linux-yocto_6.6%.bbappend