diff --git a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/build_flasher.sh b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/build_flasher.sh
index 2f8a94be5..723310447 100755
--- a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/build_flasher.sh
+++ b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/build_flasher.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-dnf install --setopt=install_weak_deps=false -y git make gcc gcc-c++ which file diffutils wget cpio rsync bc lzop zip patch perl tar qemu-system-aarch64 qemu-img unzboot uboot-tools kmod
+dnf install --setopt=install_weak_deps=false -y git make gcc gcc-c++ which file diffutils wget cpio rsync bc lzop zip patch perl tar qemu-system-aarch64 qemu-img unzboot uboot-tools kmod awk
 
-git clone --depth 1 --branch 2025.05-rc2  https://github.com/buildroot/buildroot /buildroot
+git clone --depth 1 --branch 2025.05  https://github.com/buildroot/buildroot /buildroot
 
-./add_kernel.sh
+./replace_kernel.sh
 cp -R overlay /buildroot
-cp renesas_s4_defconfig  /buildroot/configs/
-( cd /buildroot; make renesas_s4_defconfig && make )
+cp rootfs_only_defconfig  /buildroot/configs/
+( cd /buildroot; make rootfs_only_defconfig && make )
 mkimage -f flasher.its data/flasher.itb
diff --git a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/overlay/etc/udev/rules.d/10-rename-tsn0.rules b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/overlay/etc/udev/rules.d/10-rename-tsn0.rules
new file mode 100644
index 000000000..e3fd0b5f1
--- /dev/null
+++ b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/overlay/etc/udev/rules.d/10-rename-tsn0.rules
@@ -0,0 +1,2 @@
+# rename Renesas S4 main interface tsn0 to eth0 to unify setup
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="tsn0", NAME="eth0"
diff --git a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/add_kernel.sh b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/replace_kernel.sh
similarity index 97%
rename from packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/add_kernel.sh
rename to packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/replace_kernel.sh
index 8342461b7..6e91c25e0 100755
--- a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/add_kernel.sh
+++ b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/replace_kernel.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-KVER="5.14.0-587.536.el9iv.aarch64"
+KVER="5.14.0-594.543.el9iv.aarch64"
 KMOD=(
 	# R-Car S4 storage
 	fixed
diff --git a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/renesas_s4_defconfig b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/rootfs_only_defconfig
similarity index 95%
rename from packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/renesas_s4_defconfig
rename to packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/rootfs_only_defconfig
index 363dc8a24..299568f45 100644
--- a/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/renesas_s4_defconfig
+++ b/packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/rootfs_only_defconfig
@@ -4,7 +4,7 @@ BR2_TARGET_GENERIC_HOSTNAME="flasher"
 BR2_TARGET_GENERIC_ISSUE="flasher"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_ROOT_PASSWD=""
-BR2_SYSTEM_DHCP="tsn0"
+BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_OVERLAY="$(CONFIG_DIR)/overlay"
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_OPENSSL=y