diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
index 06cabfb23da..997ed4f21da 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
@@ -1,16 +1,16 @@
-.virgl-rules:
-  stage: layered-backends
+.virgl-manual-rules:
+  stage: layered-backends-nightly
   rules:
     - !reference [.test, rules]
-    - !reference [.gl-rules, rules]
-    - !reference [.llvmpipe-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - !reference [.llvmpipe-manual-rules, rules]
     - changes: &virgl_file_list
-      - src/gallium/drivers/virgl/**/*
-      - src/gallium/winsys/virgl/**/*
+        - src/gallium/drivers/virgl/**/*
+        - src/gallium/winsys/virgl/**/*
       when: on_success
 
 .virgl-iris-manual-rules:
-  stage: layered-backends
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -44,7 +44,7 @@
 .virpipe-test:
   extends:
     - .test-gl
-    - .virgl-rules
+    - .virgl-manual-rules
   timeout: 15m
   variables:
     GALLIUM_DRIVER: virpipe
@@ -62,7 +62,7 @@
   extends:
     - .test-gl
     - .test-crosvm
-    - .virgl-rules
+    - .virgl-manual-rules
   timeout: 15m
   variables:
     FLAKES_CHANNEL: "#virgl-ci"
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 490b7f16c66..67915dbaf6a 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -68,7 +68,7 @@ virgl-traces:
 .android-virgl-llvmpipe:
   extends:
     - .test-android
-    - .virgl-rules
+    - .virgl-manual-rules
   variables:
     CUTTLEFISH_GPU_MODE: drm_virgl
     GPU_VERSION: virgl-gl