diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 958c71578..8b3d425c0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,8 +21,7 @@ steps:
                 using Pkg
                 Pkg.test("CUDA"; coverage=true, test_args=["base/kernelabstractions"])'
     agents:
-      queue: "juliagpu"
-      cuda: "*"
+      queue: "cuda"
     timeout_in_minutes: 120
     soft_fail:
       - exit_status: 3
@@ -53,18 +52,20 @@ steps:
                 include("test/extensions/enzyme.jl")
                 enzyme_testsuite(CUDABackend, CuArray, true)'
     agents:
-      queue: "juliagpu"
-      cuda: "*"
+      queue: "cuda"
     timeout_in_minutes: 120
     soft_fail:
       - exit_status: 3
 
+
   - label: "Metal Julia {{matrix.version}}"
     matrix:
       setup:
         version:
           - "1.10"
           - "1.11"
+          - "1.12"
+          - "1.13"
     plugins:
       - JuliaCI/julia#v1:
           version: "{{matrix.version}}"
@@ -80,12 +81,13 @@ steps:
                 using Pkg
                 Pkg.test("Metal"; coverage=true, test_args=["kernelabstractions"])'
     agents:
-      queue: "juliaecosystem"
-      os: "macos"
-      arch: "aarch64"
+      queue: "metal"
     timeout_in_minutes: 120
     soft_fail:
       - exit_status: 3
+    env:
+      JULIA_PROJECT: "@metal"
+
 
   - label: "oneAPI Julia {{matrix.version}}"
     matrix:
@@ -93,6 +95,8 @@ steps:
         version:
           - "1.10"
           - "1.11"
+          - "1.12"
+          - "1.13"
     plugins:
       - JuliaCI/julia#v1:
           version: "{{matrix.version}}"
@@ -108,8 +112,7 @@ steps:
                 using Pkg
                 Pkg.test("oneAPI"; coverage=true, test_args=["kernelabstractions"])'
     agents:
-      queue: "juliagpu"
-      intel: "*"
+      queue: "oneapi"
     timeout_in_minutes: 120
     soft_fail:
       - exit_status: 3
@@ -120,6 +123,8 @@ steps:
         version:
           - "1.10"
           - "1.11"
+          - "1.12"
+          - "1.13"
     plugins:
       - JuliaCI/julia#v1:
           version: "{{matrix.version}}"
@@ -135,14 +140,44 @@ steps:
                 using Pkg
                 Pkg.test("AMDGPU"; coverage=true, test_args=["kernelabstractions"])'
     agents:
-      queue: "juliagpu"
-      rocm: "*"
+      queue: "rocm"
     timeout_in_minutes: 120
     soft_fail:
       - exit_status: 3
     env:
       JULIA_NUM_THREADS: 4
 
+  - label: "OpenCL Julia {{matrix.version}}"
+    matrix:
+      setup:
+        version:
+          - "1.10"
+          - "1.11"
+          - "1.12"
+          - "1.13"
+    plugins:
+      - JuliaCI/julia#v1:
+          version: "{{matrix.version}}"
+      - JuliaCI/julia-coverage#v1:
+          codecov: true
+    command: |
+      julia -e 'println("--- :julia: Instantiating project")
+                using Pkg
+                Pkg.develop(; path=pwd())
+                Pkg.develop(; name="OpenCL")' || exit 3
+
+      julia -e 'println("+++ :julia: Running tests")
+                using Pkg
+                Pkg.test("OpenCL"; coverage=true, test_args=`--platform=cuda kernelabstractions`)'
+    agents:
+      queue: "cuda"
+    timeout_in_minutes: 120
+    soft_fail:
+      - exit_status: 3
+    env:
+      OCL_ICD_FILENAMES: "libnvidia-opencl.so.1"
+      JULIA_PROJECT: "@OpenCL"
+
 env:
   JULIA_PKG_SERVER: "" # it often struggles with our large artifacts
   SECRET_CODECOV_TOKEN: "c5pjPUwULD2L8ss0gRtjCPiagRlTQ11TdbZP6gIhTPeA/gN5w5/7JvDCg36UpKER6FXnQDeBGGkQafHiLdBaH/FWQ2B2VKErtBarIBJa2zWvKu8mYs9PJzw/qLGT2sMXI9kcao63H6/HAwbslJcY0a5Mg+SwM3M05XqSHgnrHMnbBXysKP6VzFEIX7uoyEKOnoWDj8rGJKFYLW2DBRtd6Yc23ESfFXPAqbS7sgXxwQHKzz20FMQBJUmbiDIzPlk3k2n2TvgAWQ0VNK0e4/UooMbULL3UjY4oaMOF0XpJAnWlmvGgy8gEnZKSVp3ieXy/Ubu7BWwH/BT59wDy6LuDxA==;U2FsdGVkX18Wil69f7qJYu6yU5iNx+Zq8akUcOp+McU1CR4Jw4QBsrUKIF4W4uK+/752FQo40BwFsfnIC8CJ/Q=="