diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a774362780..e4bd2bece8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,14 +99,16 @@ stages:
     - runner-manager
     - aarch64
 
-# Stress-testing runners
+# Autoscaling GitLab Runner on AWS EC2 (FreeBSD)
 
 .freebsd-stress-amd64: &freebsd_stress_amd64
   tags:
-    - amd64
+    - bsd-stress-test
     - aws
-    - bsd-stress
-    - stress
+    - autoscaler
+    - shell
+    - stress-test
+    - amd64
 
 ### Docker Image Templates