diff --git a/.buildkite/Manifest.toml b/.buildkite/Manifest.toml
index 36ade152b0..979d8c0425 100644
--- a/.buildkite/Manifest.toml
+++ b/.buildkite/Manifest.toml
@@ -2358,9 +2358,9 @@ version = "1.1.43+0"
 
 [[deps.XZ_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "6e6f1a4f245f66f93f28e55879f9ba47fed66f36"
+git-tree-sha1 = "fee71455b0aaa3440dfdd54a9a36ccef829be7d4"
 uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
-version = "5.8.0+0"
+version = "5.8.1+0"
 
 [[deps.Xorg_libICE_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7e769cb677..503d51cb80 100755
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 agents:
   queue: new-central
   slurm_mem: 8G
-  modules: climacommon/2024_10_10
+  modules: climacommon/2025_03_18
 
 env:
   JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
diff --git a/benchmarks/bickleyjet/Manifest.toml b/benchmarks/bickleyjet/Manifest.toml
index 1396e40cfd..ab83fca9ca 100644
--- a/benchmarks/bickleyjet/Manifest.toml
+++ b/benchmarks/bickleyjet/Manifest.toml
@@ -1562,9 +1562,9 @@ version = "1.1.43+0"
 
 [[deps.XZ_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "6e6f1a4f245f66f93f28e55879f9ba47fed66f36"
+git-tree-sha1 = "fee71455b0aaa3440dfdd54a9a36ccef829be7d4"
 uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
-version = "5.8.0+0"
+version = "5.8.1+0"
 
 [[deps.Xorg_libICE_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
diff --git a/lib/ClimaCoreMakie/examples/Manifest.toml b/lib/ClimaCoreMakie/examples/Manifest.toml
index 01b28438c1..d5bce7e031 100644
--- a/lib/ClimaCoreMakie/examples/Manifest.toml
+++ b/lib/ClimaCoreMakie/examples/Manifest.toml
@@ -1949,9 +1949,9 @@ version = "1.1.43+0"
 
 [[deps.XZ_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "6e6f1a4f245f66f93f28e55879f9ba47fed66f36"
+git-tree-sha1 = "fee71455b0aaa3440dfdd54a9a36ccef829be7d4"
 uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
-version = "5.8.0+0"
+version = "5.8.1+0"
 
 [[deps.Xorg_libX11_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"]
diff --git a/test/MatrixFields/matrix_field_test_utils.jl b/test/MatrixFields/matrix_field_test_utils.jl
index 39a6f883e6..2c65c41da9 100644
--- a/test/MatrixFields/matrix_field_test_utils.jl
+++ b/test/MatrixFields/matrix_field_test_utils.jl
@@ -70,15 +70,8 @@ function test_field_broadcast(;
     ref_set_result = nothing,
     time_ratio_limit = 10,
     max_eps_error_limit = 10,
-    test_broken_with_cuda = false,
 )
     @testset "$test_name" begin
-        if test_broken_with_cuda && using_cuda
-            @test_throws invalid_ir_error materialize(get_result)
-            @warn "$test_name:\n\tCUDA.InvalidIRError"
-            return
-        end
-
         result = materialize(get_result)
         result_copy = copy(result)
         time = @benchmark materialize!(result, set_result)
diff --git a/test/MatrixFields/operator_matrices.jl b/test/MatrixFields/operator_matrices.jl
index 33b0afea68..ffa0580fe7 100644
--- a/test/MatrixFields/operator_matrices.jl
+++ b/test/MatrixFields/operator_matrices.jl
@@ -330,7 +330,6 @@ end
             )
         ),
         time_ratio_limit = 30, # This case's ref function is fast on Buildkite.
-        test_broken_with_cuda = true, # TODO: Fix this.
     )
 
     # TODO: For some reason, we need to compile and run @test_opt on several