diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml
index ae6347204c1..5bdb71af906 100644
--- a/src/panfrost/ci/gitlab-ci-inc.yml
+++ b/src/panfrost/ci/gitlab-ci-inc.yml
@@ -167,6 +167,7 @@
 #   FDO_CI_CONCURRENT: ?
     RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
     VK_DRIVER: panfrost
+    KERNEL_TAG: "v6.18-pan-mesa-68b4"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/mt8183-kukui-jacuzzi-juniper-sku16
 .lava-mt8183-kukui-jacuzzi-juniper-sku16:arm64:
@@ -192,6 +193,7 @@
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-mt8186-corsola-steelix-sku131072
     VK_DRIVER: panfrost
+    KERNEL_TAG: "v6.18-pan-mesa-68b4"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/mt8192-asurada-spherion-r0
 .lava-mt8192-asurada-spherion-r0:arm64:
@@ -257,6 +259,7 @@
     RUNNER_TAG: mesa-ci-x86-64-lava-rk3588-rock-5b
     VK_DRIVER: panfrost
     LAVA_FIRMWARE: arm
+    KERNEL_TAG: "v6.18-pan-mesa-68b4"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/mt8196-rauru-navi-sku0
 .lava-mt8196-rauru-navi-sku0:arm64:
@@ -273,7 +276,7 @@
     VK_DRIVER: panfrost
     LAVA_FIRMWARE: arm
     # Mainline kernel support for MT8196 is still incomplete
-    KERNEL_TAG: rauru-for-mesa-ci-0dda
+    KERNEL_TAG: "v6.18-pan-mesa-68b4"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/sun50i-h6-pine-h64
 .lava-sun50i-h6-pine-h64:arm64:
diff --git a/src/panfrost/ci/panfrost-g610-gles2-extensions.txt b/src/panfrost/ci/panfrost-g610-gles2-extensions.txt
index 1c86623c367..c684b25453f 100644
--- a/src/panfrost/ci/panfrost-g610-gles2-extensions.txt
+++ b/src/panfrost/ci/panfrost-g610-gles2-extensions.txt
@@ -46,6 +46,7 @@ GL_EXT_shader_implicit_conversions
 GL_EXT_shader_integer_mix
 GL_EXT_shader_io_blocks
 GL_EXT_shader_pixel_local_storage
+GL_EXT_shader_realtime_clock
 GL_EXT_shadow_samplers
 GL_EXT_sRGB
 GL_EXT_sRGB_write_control