diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fc7be6e3a..8679f31f46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,7 +90,7 @@ stages:
     - ovh
     - amd64
 
-# Autoscaling GitLab Runner on AWS EC2
+# Autoscaling GitLab Runner on AWS EC2 (amd64)
 
 .linux-amd64: &linux_amd64
   tags:
@@ -99,21 +99,16 @@ stages:
     - runner-manager
     - amd64
 
-# Stress-testing runners
+# Autoscaling GitLab Runner on AWS EC2 (arm64)
 
-.linux-stress-amd64: &linux_stress_amd64
+.linux-arm64: &linux_arm64
   tags:
-    - amd64
+    - linux
     - aws
-    - linux-stress
-    - stress
-
-.linux-stress-arm64: &linux_stress_arm64
-  tags:
+    - runner-manager
     - aarch64
-    - aws
-    - linux-stress
-    - stress
+
+# Stress-testing runners
 
 .freebsd-stress-amd64: &freebsd_stress_amd64
   tags:
@@ -192,7 +187,7 @@ stages:
 
 .fedora-38-arm64: &fedora_38_arm64_image
   image: "$CI_REGISTRY_IMAGE:fedora-38-arm64"
-  <<: *linux_stress_arm64
+  <<: *linux_arm64
 
 # Ubuntu
 
@@ -1579,7 +1574,7 @@ respdiff-long-third-party:
 
 stress:authoritative:fedora:38:amd64:
   <<: *fedora_38_amd64_image
-  <<: *linux_stress_amd64
+  <<: *linux_amd64
   <<: *stress_job
   variables:
     CC: gcc
@@ -1594,7 +1589,7 @@ stress:authoritative:fedora:38:amd64:
 
 stress:recursive:fedora:38:amd64:
   <<: *fedora_38_amd64_image
-  <<: *linux_stress_amd64
+  <<: *linux_amd64
   <<: *stress_job
   variables:
     CC: gcc
@@ -1609,7 +1604,7 @@ stress:recursive:fedora:38:amd64:
 
 stress:rpz:fedora:38:amd64:
   <<: *fedora_38_amd64_image
-  <<: *linux_stress_amd64
+  <<: *linux_amd64
   <<: *stress_job
   variables:
     CC: gcc
@@ -1624,7 +1619,7 @@ stress:rpz:fedora:38:amd64:
 
 stress:authoritative:fedora:38:arm64:
   <<: *fedora_38_arm64_image
-  <<: *linux_stress_arm64
+  <<: *linux_arm64
   <<: *stress_job
   variables:
     CC: gcc
@@ -1639,7 +1634,7 @@ stress:authoritative:fedora:38:arm64:
 
 stress:recursive:fedora:38:arm64:
   <<: *fedora_38_arm64_image
-  <<: *linux_stress_arm64
+  <<: *linux_arm64
   <<: *stress_job
   variables:
     CC: gcc
@@ -1654,7 +1649,7 @@ stress:recursive:fedora:38:arm64:
 
 stress:rpz:fedora:38:arm64:
   <<: *fedora_38_arm64_image
-  <<: *linux_stress_arm64
+  <<: *linux_arm64
   <<: *stress_job
   variables:
     CC: gcc