diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml
index 5bdb71af906..f54008f123f 100644
--- a/src/panfrost/ci/gitlab-ci-inc.yml
+++ b/src/panfrost/ci/gitlab-ci-inc.yml
@@ -167,7 +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"
+    KERNEL_TAG: "v6.18-pan-mesa-296c"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/mt8183-kukui-jacuzzi-juniper-sku16
 .lava-mt8183-kukui-jacuzzi-juniper-sku16:arm64:
@@ -193,7 +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"
+    KERNEL_TAG: "v6.18-pan-mesa-296c"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/mt8192-asurada-spherion-r0
 .lava-mt8192-asurada-spherion-r0:arm64:
@@ -259,7 +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"
+    KERNEL_TAG: "v6.18-pan-mesa-296c"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/mt8196-rauru-navi-sku0
 .lava-mt8196-rauru-navi-sku0:arm64:
@@ -276,7 +276,7 @@
     VK_DRIVER: panfrost
     LAVA_FIRMWARE: arm
     # Mainline kernel support for MT8196 is still incomplete
-    KERNEL_TAG: "v6.18-pan-mesa-68b4"
+    KERNEL_TAG: "v6.18-pan-mesa-296c"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/sun50i-h6-pine-h64
 .lava-sun50i-h6-pine-h64:arm64:
diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 79d27444abe..028d3893bde 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -109,9 +109,6 @@ panfrost-g52-piglit:arm64:
   variables:
     HWCI_START_WESTON: 1
     DEQP_SUITE: panfrost-g52-piglit
-    # Transparent huge pages cause an OOM, and the oom-killer decides to kill weston
-    # Disable THP until this is sorted out
-    LAVA_CMDLINE: "panfrost.transparent_hugepage=false"
 
 panfrost-g72-gl:arm64:
   parallel: 3