diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt
index 1fd54df45c4..0c95894ee26 100644
--- a/src/broadcom/ci/broadcom-rpi3-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi3-fails.txt
@@ -1230,7 +1230,6 @@ ubsan-KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth
 ubsan-KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_short_depth_component16,Fail
 ubsan-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail
 ubsan-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
-ubsan-dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_and_pos_x_neg_y_pos_z_and_neg_x_pos_y_neg_z,Fail
 ubsan-dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked,Fail
 ubsan-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_mirror_rgba8888,Fail
 ubsan-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_rgba8888,Fail
diff --git a/src/broadcom/ci/broadcom-rpi3-flakes.txt b/src/broadcom/ci/broadcom-rpi3-flakes.txt
index 2fdc376a9ba..239fdf870c2 100644
--- a/src/broadcom/ci/broadcom-rpi3-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi3-flakes.txt
@@ -209,13 +209,13 @@ spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=2
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=4
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=2
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4
-spec@!opengl 1.1@draw-sync
 spec@!opengl 1.1@masked-clear
 spec@arb_color_buffer_float@gl_rgba8-render
 spec@arb_es2_compatibility@arb_es2_compatibility-releaseshadercompiler
 spec@ext_framebuffer_blit@fbo-sys-blit
 spec@ext_framebuffer_blit@fbo-sys-sub-blit
 spec@ext_framebuffer_multisample@accuracy all_samples stencil_draw small depthstencil
+spec@ext_framebuffer_multisample@sample-alpha-to-coverage 2 depth
 spec@ext_framebuffer_object@fbo-flushing-2
 
 gl_discard
diff --git a/src/broadcom/ci/broadcom-rpi3-skips.txt b/src/broadcom/ci/broadcom-rpi3-skips.txt
index 7cb4c295ea2..42b2c252dda 100644
--- a/src/broadcom/ci/broadcom-rpi3-skips.txt
+++ b/src/broadcom/ci/broadcom-rpi3-skips.txt
@@ -33,3 +33,7 @@ spec@glsl-3.*
 spec@glsl-4.*
 spec@glsl-es-3.*
 
+# Slow piglit tests (> 1 minute to run)
+spec@!opengl 1.1@copypixels-draw-sync
+spec@!opengl 1.1@draw-sync
+spec@arb_vertex_buffer_object@vbo-subdata-many drawrangeelements
diff --git a/src/broadcom/ci/broadcom-rpi4-flakes.txt b/src/broadcom/ci/broadcom-rpi4-flakes.txt
index 6e2c1a5da0e..6074eb21cfe 100644
--- a/src/broadcom/ci/broadcom-rpi4-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi4-flakes.txt
@@ -177,3 +177,4 @@ spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=2
 
 dEQP-VK.glsl.operator.unary_operator.post_decrement_result.highp_uvec4_vertex
 dEQP-VK.image.format_reinterpret.1d.r8g8b8a8_sint_b10g11r11_ufloat_pack32
+dEQP-VK.synchronization2.timeline_semaphore.device_host.write_copy_image_to_buffer_read_vertex_input.buffer_262144
diff --git a/src/broadcom/ci/broadcom-rpi4-skips.txt b/src/broadcom/ci/broadcom-rpi4-skips.txt
index 77a2e54db1e..d6f2de0463c 100644
--- a/src/broadcom/ci/broadcom-rpi4-skips.txt
+++ b/src/broadcom/ci/broadcom-rpi4-skips.txt
@@ -76,6 +76,7 @@ dEQP-VK.ssbo.phys.layout.single_struct_array.single_buffer.std430_instance_array
 dEQP-VK.ssbo.phys.layout.single_struct_array.single_buffer.std430_instance_array_store_cols
 dEQP-VK.ubo.random.16bit.all_per_block_buffers.27
 dEQP-VK.ubo.random.all_shared_buffer.48
+ubsan-dEQP-VK.ssbo.layout.3_level_array.std140.column_major_mat4_comp_access
 ubsan-dEQP-VK.ssbo.phys.layout.3_level_array.std430.column_major_mat4x3_store_cols
 ubsan-dEQP-VK.ssbo.phys.layout.3_level_unsized_array.std140.column_major_mat4x3_store_cols
 ubsan-dEQP-VK.ssbo.phys.layout.single_struct_array.per_block_buffer.std140_instance_array_store_cols
diff --git a/src/broadcom/ci/gitlab-ci-inc.yml b/src/broadcom/ci/gitlab-ci-inc.yml
index 6d41c4bf299..c3c211cccb1 100644
--- a/src/broadcom/ci/gitlab-ci-inc.yml
+++ b/src/broadcom/ci/gitlab-ci-inc.yml
@@ -190,8 +190,8 @@
   extends:
     - .ci-tron-b2c-diskless-v1
   variables:
-    RPI_DOWNSTREAM_PACKAGE_VERSION: '1.20251218'
-    RPI_DOWNSTREAM_KERNEL_VERSION: '6.12.62\+rpt-rpi'
+    RPI_DOWNSTREAM_PACKAGE_VERSION: '1.20260512'
+    RPI_DOWNSTREAM_KERNEL_VERSION: '6.18.29\+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.