diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 19a320b2..b140b3da 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,42 +1,104 @@
-- group: "CUDA"
-  key: "cuda"
-  steps:
-   - label: "Tests -- Julia latest"
-     plugins:
-       - JuliaCI/julia#v1:
-           version: "1"
-           persist_depot_dirs: packages, artifacts, compiled
-     agents:
-       queue: "juliagpu"
-       cuda: "11.0"
-     if: build.message !~ /\[skip tests\]/
-     timeout_in_minutes: 60
-     env:
-       JULIA_CUDA_MEMORY_POOL: "none"
-     commands: |
-       echo "+++ Run tests"
-       julia --color=yes --project=. -e '
-          import Pkg
-          Pkg.test("FastIce")
-          '
-- group: "ROCm"
-  key: "rocm"
-  steps:
-   - label: "Tests -- Julia latest"
-     plugins:
-       - JuliaCI/julia#v1:
-           version: "1"
-           persist_depot_dirs: packages, artifacts, compiled
-     agents:
-       queue: "juliagpu"
-       rocm: "*" # todo fix ROCM version
-     if: build.message !~ /\[skip tests\]/
-     timeout_in_minutes: 60
-     soft_fail:
-       - exit_status: 1
-     commands: |
-       echo "+++ Run tests"
-       julia --color=yes --project=. -e '
-          import Pkg
-          Pkg.test("FastIce")
-          '
\ No newline at end of file
+steps:
+  - label: "CUDA Julia {{matrix.version}}"
+    matrix:
+      setup:
+        version:
+          - "1.9"
+    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="CUDA")' || exit 3
+
+      julia -e 'println("+++ :julia: Running tests")
+                using Pkg
+                Pkg.test("CUDA")'
+    agents:
+      queue: "juliagpu"
+      cuda: "*"
+    timeout_in_minutes: 120
+    soft_fail:
+      - exit_status: 3
+
+  - label: "AMDGPU Julia {{matrix.version}}"
+    matrix:
+      setup:
+        version:
+          - "1.9"
+    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="AMDGPU")' || exit 3
+
+      julia -e 'println("+++ :julia: Running tests")
+                using Pkg
+                Pkg.test("AMDGPU")'
+    agents:
+      queue: "juliagpu"
+      rocm: "*"
+    timeout_in_minutes: 120
+    soft_fail:
+      - exit_status: 3
+    env:
+      JULIA_NUM_THREADS: 4
+
+
+# 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=="
+
+
+
+# - group: "CUDA"
+#   key: "cuda"
+#   steps:
+#    - label: "Tests -- Julia latest"
+#      plugins:
+#        - JuliaCI/julia#v1:
+#            version: "1"
+#            persist_depot_dirs: packages, artifacts, compiled
+#      agents:
+#        queue: "juliagpu"
+#        cuda: "11.0"
+#      if: build.message !~ /\[skip tests\]/
+#      timeout_in_minutes: 60
+#      env:
+#        JULIA_CUDA_MEMORY_POOL: "none"
+#      commands: |
+#        echo "+++ Run tests"
+#        julia --color=yes --project=. -e '
+#           import Pkg
+#           Pkg.test("FastIce")
+#           '
+# - group: "ROCm"
+#   key: "rocm"
+#   steps:
+#    - label: "Tests -- Julia latest"
+#      plugins:
+#        - JuliaCI/julia#v1:
+#            version: "1"
+#            persist_depot_dirs: packages, artifacts, compiled
+#      agents:
+#        queue: "juliagpu"
+#        rocm: "*" # todo fix ROCM version
+#      if: build.message !~ /\[skip tests\]/
+#      timeout_in_minutes: 60
+#      soft_fail:
+#        - exit_status: 1
+#      commands: |
+#        echo "+++ Run tests"
+#        julia --color=yes --project=. -e '
+#           import Pkg
+#           Pkg.test("FastIce")
+#           '
\ No newline at end of file