diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.conf
index 69b78e597c..587c19fef8 100644
--- a/config/boards/rockpi-s.conf
+++ b/config/boards/rockpi-s.conf
@@ -2,4 +2,5 @@
 BOARD_NAME="ROCK Pi S"
 BOARDFAMILY="rockpis"
 BOOTCONFIG="rockpi-s-rk3308_defconfig"
+DEFAULT_OVERLAYS="uart0"
 KERNEL_TARGET="legacy,dev"
diff --git a/config/sources/families/rockpis.conf b/config/sources/families/rockpis.conf
index 832e8c4b0d..227833dd3b 100644
--- a/config/sources/families/rockpis.conf
+++ b/config/sources/families/rockpis.conf
@@ -8,6 +8,7 @@ BOOTPATCHDIR="u-boot-rockchip64"
 BOOTSCRIPT='boot-rockpis.cmd:boot.cmd'
 BOOTENV_FILE='rockpis.txt'
 KERNELDIR='linux-rockchip64'
+OVERLAY_PREFIX='rk3308'
 
 case $BRANCH in
 
diff --git a/patch/kernel/rockpis-legacy/0001-rockpi-s.patch b/patch/kernel/rockpis-legacy/0001-rockpi-s.patch
index b3e68adb69..9ee61f7287 100644
--- a/patch/kernel/rockpis-legacy/0001-rockpi-s.patch
+++ b/patch/kernel/rockpis-legacy/0001-rockpi-s.patch
@@ -44,10 +44,10 @@ index dfa1ae79..2a0d76b4 100644
  		};
  	};
  
-diff --git a/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts b/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
+diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
 index c64afc6a..e039eaa9 100644
---- a/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
-+++ b/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
+--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
 @@ -7,7 +7,7 @@
  
  #include <dt-bindings/input/input.h>
@@ -66,77 +66,3 @@ index c64afc6a..e039eaa9 100644
  	};
  
  	wireless-wlan {
-@@ -342,6 +342,10 @@
- 	};
- };
- 
-+&uart0 {
-+	status = "okay";
-+};
-+
- &uart4 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart4_xfer &uart4_cts>;
-diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 1c15717e..8b1aabd3 100644
---- a/scripts/Makefile.dtbinst
-+++ b/scripts/Makefile.dtbinst
-@@ -29,6 +29,9 @@ ifeq ("$(dtbinst-root)", "$(obj)")
- endif
- 
- dtbinst-files	:= $(dtb-y)
-+dtboinst-files	:= $(dtbo-y)
-+script-files	:= $(scr-y)
-+readme-files	:= $(dtbotxt-y)
- dtbinst-dirs	:= $(dts-dirs)
- 
- # Helper targets for Installing DTBs into the boot directory
-@@ -42,10 +45,19 @@ $(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
- $(dtbinst-files): %.dtb: $(obj)/%.dtb
- 	$(call cmd,dtb_install,$(install-dir))
- 
-+$(dtboinst-files): %.dtbo: $(obj)/%.dtbo
-+	$(call cmd,dtb_install,$(install-dir))
-+
-+$(script-files): %.scr: $(obj)/%.scr
-+	$(call cmd,dtb_install,$(install-dir))
-+
-+$(readme-files): %: $(src)/%
-+	$(call cmd,dtb_install,$(install-dir))
-+
- $(dtbinst-dirs):
- 	$(Q)$(MAKE) $(dtbinst)=$(obj)/$@
- 
--PHONY += $(dtbinst-files) $(dtbinst-dirs)
--__dtbs_install: $(dtbinst-files) $(dtbinst-dirs)
-+PHONY += $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs)
-+__dtbs_install: $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs)
- 
- .PHONY: $(PHONY)
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 75aa16f7..f3d5c23d 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -322,14 +322,20 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
- quiet_cmd_dtco = DTCO    $@
- cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
- 	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
--	$(DTC) -@ -H epapr -O dtb -o $@ -b 0 \
-+	$(DTC) -O dtb -o $@ -b 0 \
- 		-i $(dir $<) $(DTC_FLAGS) \
- 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
- 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
- 
--$(obj)/%.dtbo: $(src)/%-overlay.dts FORCE
-+$(obj)/%.dtbo: $(src)/%.dts FORCE
- 	$(call if_changed_dep,dtco)
- 
-+quiet_cmd_scr = MKIMAGE $@
-+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
-+
-+$(obj)/%.scr: $(src)/%.scr-cmd FORCE
-+	$(call if_changed,scr)
-+
- dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
- 
- # cat
diff --git a/patch/kernel/rockpis-legacy/0002-rockpi-s.patch b/patch/kernel/rockpis-legacy/0002-rockpi-s.patch
deleted file mode 100644
index 6aa275de8d..0000000000
--- a/patch/kernel/rockpis-legacy/0002-rockpi-s.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index dd3debbd..c5482966 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -137,11 +137,11 @@ dtstree     := $(srctree)/$(src)
- dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
- 
- always		:= $(dtb-y)
--subdir-y	:= $(dts-dirs) overlays-rockpis
-+subdir-y	:= $(dts-dirs) overlay
- clean-files	:= *.dtb
- 
- # Enable fixups to support overlays on ROCK Pi platforms
- ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
- 	DTC_FLAGS ?= -@ -H epapr
--	dts-dirs += overlays-rockpis
-+	dts-dirs += overlay
- endif
-diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
-new file mode 100644
-index 00000000..253d6f16
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile
-@@ -0,0 +1,17 @@
-+# SPDX-License-Identifier: GPL-2.0
-+dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
-+        rockchip-uart0.dtbo \
-+        rockchip-uart1.dtbo
-+
-+#scr-$(CONFIG_ARCH_ROCKCHIP) += \
-+#       rockchip-fixup.scr
-+#
-+#dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \
-+#       README.rockchip-overlays
-+
-+targets += dtbs dtbs_install
-+targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
-+
-+always         := $(dtbo-y) $(scr-y) $(dtbotxt-y)
-+clean-files    := *.dtbo *.scr
-+
-diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts
-new file mode 100644
-index 00000000..f0112a24
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart0.dts
-@@ -0,0 +1,14 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "rockchip,rk3308";
-+
-+	fragment@0 {
-+		target = <&uart0>;
-+
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts
-new file mode 100644
-index 00000000..42394129
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart1.dts
-@@ -0,0 +1,14 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "rockchip,rk3308";
-+
-+	fragment@0 {
-+		target = <&uart1>;
-+
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+};
diff --git a/patch/kernel/rockpis-legacy/board-rockpi-s-fix-thermal-zones.patch b/patch/kernel/rockpis-legacy/board-rockpi-s-fix-thermal-zones.patch
new file mode 100644
index 0000000000..0e5e586f54
--- /dev/null
+++ b/patch/kernel/rockpis-legacy/board-rockpi-s-fix-thermal-zones.patch
@@ -0,0 +1,17 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+index aa5ce6856..4a72ffed8 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+@@ -365,12 +365,6 @@
+ 	status = "okay";
+ };
+ 
+-&thermal_zones {
+-	soc_thermal {
+-		thermal-sensors = <&tsadc 0>;
+-	};
+-};
+-
+ &wdt {
+ 	status = "okay";
+ };
diff --git a/patch/kernel/rockpis-legacy/board-rockpi-s-modern-dts-link.patch b/patch/kernel/rockpis-legacy/board-rockpi-s-modern-dts-link.patch
deleted file mode 100644
index 6239d80195..0000000000
--- a/patch/kernel/rockpis-legacy/board-rockpi-s-modern-dts-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index 3c650d60..15abd689 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -28,6 +28,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb-dmic-pdm-v10.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb-dmic-pdm-v11.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-fpga.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-robot.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-voice-module-board-v10.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308b-evb-amic-v10.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v10.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
-new file mode 120000
-index 00000000..6db75655
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
-@@ -0,0 +1 @@
-+rockpi-s-linux.dts
-\ No newline at end of file