diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78ba118f553..49d75428de6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,9 @@ stages:
   - meson-x86_64
   - build-misc
   - software-renderer
-  - freedreno
-  - panfrost
-  - lima
   - amd
+  - arm
+  - freedreno
   - layered-backends
   - success
 
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 78c01f07162..fe8e52ef77f 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -131,7 +131,7 @@
     - when: never
 
 .panfrost-rules:
-  stage: panfrost
+  stage: arm
   rules:
     - *ignore_scheduled_pipelines
     - changes:
@@ -148,7 +148,7 @@
     - when: never
 
 .lima-rules:
-  stage: lima
+  stage: arm
   rules:
     - *ignore_scheduled_pipelines
     - changes: