diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ebdcebd..a86290f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,56 @@
-variables:
-  CI_IMAGE_TAG: 'opencl'
-
 stages:
-  - test
-  - postprocess
+    - test
+    - post
 
 include:
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v0/common.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v0/test_v0.7.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v0/test_v1.0.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v0/test_dev.yml'
+    - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/3fbe3d2dd7288b4c91e8b7b2fbbd98b9bdeeb92a/templates/v3/common.yml'
+
+nvidia:test:dev:
+    extends: .test
+    variables:
+        CI_IMAGE_TAG: 'opencl'
+        CI_VERSION_TAG: 'dev'
+    tags:
+        - cuda
+    allow_failure: true
+
+amd:test:dev:
+    extends: .test
+    variables:
+        CI_IMAGE_TAG: 'rocm'
+        CI_VERSION_TAG: 'dev'
+    tags:
+        - rocm
+    allow_failure: true
+
+nvidia:test:v1.0:
+    extends: .test
+    variables:
+        CI_IMAGE_TAG: 'opencl'
+        CI_VERSION_TAG: 'v1.0'
+    tags:
+        - cuda
+
+amd:test:v1.0:
+    extends: .test
+    variables:
+        CI_IMAGE_TAG: 'rocm'
+        CI_VERSION_TAG: 'v1.0'
+    tags:
+        - rocm
+
+nvidia:test:v1.1:
+    extends: .test
+    variables:
+        CI_IMAGE_TAG: 'opencl'
+        CI_VERSION_TAG: 'v1.1'
+    tags:
+        - cuda
 
-test:dev:
-  allow_failure: true
+amd:test:v1.1:
+    extends: .test
+    variables:
+        CI_IMAGE_TAG: 'rocm'
+        CI_VERSION_TAG: 'v1.1'
+    tags:
+        - rocm