diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a547cba82d..a21a1d865e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1654,7 +1654,7 @@ shotgun:dot:
     - job: autoreconf
       artifacts: true
 
-.stress-test-short: &stress_test_short_job
+.stress-test-long: &stress_test_long_job
   <<: *stress_test
   artifacts:
     untracked: true
@@ -1662,9 +1662,21 @@ shotgun:dot:
       - "output/ns4/*.dtq*"
       - "output/ns4/large-delta-rpz*.local"
       - "output/rpz_*"
+    expire_in: "1 week"
     when: always
+  timeout: 2h
+
+.stress-test-short: &stress_test_short_job
+  <<: *stress_test
   only:
     - merge_requests
+  artifacts:
+    untracked: true
+    exclude:
+      - "output/ns4/*.dtq*"
+      - "output/ns4/large-delta-rpz*.local"
+      - "output/rpz_*"
+    when: always
 
 stress:short:authoritative:fedora:40:amd64:
   <<: *fedora_40_amd64_image
@@ -1771,14 +1783,6 @@ stress:short:rpz:freebsd13:amd64:
     RATE: 1500
     RUN_TIME: 15
 
-.stress-test-long: &stress_test_long_job
-  <<: *stress_test
-  artifacts:
-    untracked: true
-    expire_in: "1 week"
-    when: always
-  timeout: 2h
-
 stress:authoritative:fedora:40:amd64:
   <<: *fedora_40_amd64_image
   <<: *linux_amd64