diff --git a/src/broadcom/ci/gitlab-ci-inc.yml b/src/broadcom/ci/gitlab-ci-inc.yml
index e7cf54a7108..3fc1d8d0d3e 100644
--- a/src/broadcom/ci/gitlab-ci-inc.yml
+++ b/src/broadcom/ci/gitlab-ci-inc.yml
@@ -190,12 +190,12 @@
   extends:
     - .ci-tron-b2c-diskless-v1
   variables:
-    RPI_DOWNSTREAM_PACKAGE_VERSION: '1.20250430'
-    RPI_DOWNSTREAM_KERNEL_VERSION: '6.12.25'
+    RPI_DOWNSTREAM_PACKAGE_VERSION: '1.20251218'
+    RPI_DOWNSTREAM_KERNEL_VERSION: '6.12.62\+rpt-rpi'
     # An uprev should only change the two variables above, and technically the
     # kernel version could instead be set to `.*` in the regex below, but
     # having it here documents this information well.
-    RPI_DOWNSTREAM_PACKAGE_URL: 'https://github.com/raspberrypi/firmware/archive/refs/tags/$RPI_DOWNSTREAM_PACKAGE_VERSION.zip'
+    RPI_DOWNSTREAM_PACKAGE_URL: 'https://people.igalia.com/jasuarez/$RPI_DOWNSTREAM_PACKAGE_VERSION.zip'
     CI_TRON_DUT_SETUP_TAGS: dt_gpu:model:$RPI_MODEL,cpu:arch:$RPI_ARCH
     CI_TRON_TFTP_ARTIFACT_CATEGORY__50_BOOTLOADER__0__PATH: '/config.txt'
     CI_TRON_TFTP_ARTIFACT_CATEGORY__50_BOOTLOADER__0__DATA: |
@@ -264,11 +264,13 @@
     - .igalia-bcm2711-vc5
     - .ci-tron-broadcom
   variables:
-    CI_TRON__B2C_DISKLESS_IMAGESTORE_PLATFORM: linux/arm/v7
-    RPI_ARCH: armv7l
-    RPI_CONFIG_TXT_64BIT: 'arm_64bit=0'
-    RPI_KERNEL: 'kernel7l'
-    RPI_MODULES: 'v7l'
+    # There is no available public kernel7l module, so device is
+    # booted with 64-bit kernel and userland will run in 32bits.
+    CI_TRON__B2C_DISKLESS_IMAGESTORE_PLATFORM: linux/arm/v8
+    RPI_ARCH: aarch64
+    RPI_CONFIG_TXT_64BIT: 'arm_64bit=1'
+    RPI_KERNEL: 'kernel8'
+    RPI_MODULES: 'v8'
 
 .ci-tron-broadcom-rpi4:arm64:
   extends:
@@ -290,7 +292,7 @@
     RPI_ARCH: aarch64
     RPI_CONFIG_TXT_64BIT: 'arm_64bit=1'
     RPI_KERNEL: 'kernel_2712'
-    RPI_MODULES: 'v8-16k'
+    RPI_MODULES: '2712'
 
 .ci-tron-v3d-traces:arm64:
   extends: