diff --git a/.buildkite/JuliaProject.toml b/.buildkite/JuliaProject.toml
new file mode 100644
index 00000000..2a451c84
--- /dev/null
+++ b/.buildkite/JuliaProject.toml
@@ -0,0 +1,5 @@
+[extras]
+CUDA_Runtime_jll = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
+
+[preferences.CUDA_Runtime_jll]
+version = "local"
\ No newline at end of file
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index aad14f68..7a4119b0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,42 +1,30 @@
+agents:
+  queue: central
+  slurm_mem: 8G
+  modules: julia/1.9.3 cuda/12.2
+
 env:
   JULIA_VERSION: "1.9.3"
   OPENBLAS_NUM_THREADS: 1
-  CUDA_VERSION: "10.2"
-  JULIA_PKG_SERVER: ""
+  CUDA_VERSION: "12.2"
+  OMPI_MCA_opal_warn_on_missing_libcuda: 0
+  JULIA_CPU_TARGET: 'broadwell;skylake'
 
 steps:
-  - label: "init cpu environment :computer:"
-    key: "init_cpu_env"
+  - label: "init environment :computer:"
+    key: "init_env"
     command:
-      - "julia --project=test -e 'using Pkg; Pkg.develop(path=\".\")'"
-      - "julia --project=test -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=test -e 'using Pkg; Pkg.resolve()'"
-      - "julia --project=test -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=test -e 'using Pkg; Pkg.status()'"
+      - echo "--- Instantiate test env"
+      - julia --project=test -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); Pkg.status()'
 
-      - "julia --project=perf -e 'using Pkg; Pkg.develop(path=\".\")'"
-      - "julia --project=perf -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=perf -e 'using Pkg; Pkg.resolve()'"
-      - "julia --project=perf -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=perf -e 'using Pkg; Pkg.status()'"
-    agents:
-      config: cpu
-      queue: central
-      slurm_ntasks: 1
+      - echo "--- Instantiate perf env"
+      - julia --project=perf -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); Pkg.status()'
 
-  - label: "init gpu environment :computer:"
-    key: "init_gpu_env"
-    command:
-      - "julia --project=gpuenv -e 'using Pkg; Pkg.develop(path=\".\")'"
-      - "julia --project=gpuenv -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=gpuenv -e 'using Pkg; Pkg.resolve()'"
-      - "julia --project=gpuenv -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=gpuenv -e 'using Pkg; Pkg.status()'"
+      - echo "--- Instantiate gpu env"
+      - julia --project=gpuenv -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); using CUDA; CUDA.precompile_runtime(); Pkg.status()'
     agents:
-      config: gpu
-      queue: central
       slurm_ntasks: 1
-      slurm_gres: "gpu:1"
+      slurm_gpus: 1
 
   - wait
 
@@ -44,8 +32,6 @@ steps:
     command:
       - "julia --project=test test/runtests.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_ntasks: 1
     timeout_in_minutes: 60
 
@@ -55,8 +41,6 @@ steps:
     artifact_paths:
       - "perf/allocations_output/*"
     agents:
-      config: cpu
-      queue: central
       slurm_ntasks: 1
     timeout_in_minutes: 60
 
@@ -64,8 +48,6 @@ steps:
     command:
       - "julia --project=perf perf/benchmark.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_ntasks: 1
     timeout_in_minutes: 60
 
@@ -73,8 +55,6 @@ steps:
     command:
       - "julia --project=perf perf/microbenchmarks.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_ntasks: 1
     timeout_in_minutes: 60
 
@@ -82,8 +62,6 @@ steps:
     command:
       - "julia --project=perf perf/flops.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_ntasks: 1
     timeout_in_minutes: 60
 
@@ -91,8 +69,6 @@ steps:
     command:
       - "julia --project=perf perf/jet.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_ntasks: 1
     timeout_in_minutes: 60
 
@@ -100,18 +76,14 @@ steps:
     command:
       - "julia --project=gpuenv test/runtests_gpu.jl CuArray"
     agents:
-      config: gpu
-      queue: central
       slurm_ntasks: 1
-      slurm_gres: "gpu:1"
+      slurm_gpus: 1
     timeout_in_minutes: 60
 
   - label: "KernelAbstraction CPU tests"
     command:
       - "julia --project=gpuenv test/runtests_gpu.jl"
     agents:
-      config: gpu # we control CPU/GPU flag in script
-      queue: central
       slurm_ntasks: 1
-      slurm_gres: "gpu:1"
+      slurm_gpus: 1
     timeout_in_minutes: 60