diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 90d1a8028c..009fc73d21 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -481,7 +481,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "6.1.176"	if BR2_KERNEL_HEADERS_6_1
 	default "6.6.143"	if BR2_KERNEL_HEADERS_6_6
 	default "6.12.94"	if BR2_KERNEL_HEADERS_6_12
-	default "6.18.36"	if BR2_KERNEL_HEADERS_6_18
+	default "6.18.37"	if BR2_KERNEL_HEADERS_6_18
 	default "7.0.13"	if BR2_KERNEL_HEADERS_7_0
 	default "7.1.3"		if BR2_KERNEL_HEADERS_7_1
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index 36d7b51de7..bfb22f3df3 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  c9015d7ade2129f24940d22ae58ff290e4ef8ff6f99e98853c5e8484f4b00bcc  rpi-firmware-f1ea7092589bc9627c23916132baa7841932b707.tar.gz
+sha256  a1cd6555c84c8dd98c6b895aed27b36cea34d1f8ac8614e2283d3e8ab9fba242  rpi-firmware-958bfb0a9d14a4e5c29ed72124c0797788503c5a.tar.gz
 sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 51e4c30d79..c76d4a1b9e 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -3,8 +3,8 @@
 # rpi-firmware
 #
 ################################################################################
-# batocera (update) - Aligns to kernel version: 6.12.62
-RPI_FIRMWARE_VERSION = f1ea7092589bc9627c23916132baa7841932b707
+# batocera (update) - Aligns to kernel version: 6.18.37
+RPI_FIRMWARE_VERSION = 958bfb0a9d14a4e5c29ed72124c0797788503c5a
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom