diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 781fa9e124..b6b1b3b2ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -187,33 +187,6 @@ stages:
     - shell
     - stress-test
 
-.freebsd-autoscaler-amd64: &freebsd_autoscaler_amd64
-  variables:
-    CC: clang
-    CFLAGS: "${CFLAGS_COMMON} -Og"
-    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
-    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
-    # incompatibility; see https://bugs.freebsd.org/275241.
-    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE} --with-gssapi=/usr/local/bin/krb5-config"
-
-# Autoscaling GitLab Runner on AWS EC2 (FreeBSD 13)
-
-.freebsd-autoscaler-13-amd64: &freebsd_autoscaler_13_amd64
-  <<: *freebsd_autoscaler_amd64
-  <<: *freebsd_autoscaler_13_amd64_tags
-
-# Autoscaling GitLab Runner on AWS EC2 (FreeBSD 14)
-
-.freebsd-autoscaler-14-amd64: &freebsd_autoscaler_14_amd64
-  <<: *freebsd_autoscaler_amd64
-  <<: *freebsd_autoscaler_14_amd64_tags
-
-# Autoscaling GitLab Runner on AWS EC2 (FreeBSD 15)
-
-.freebsd-autoscaler-15-amd64: &freebsd_autoscaler_15_amd64
-  <<: *freebsd_autoscaler_amd64
-  <<: *freebsd_autoscaler_15_amd64_tags
-
 ### Docker Image Templates
 
 # Alpine Linux
@@ -1734,65 +1707,98 @@ unit:clang:trixie:amd64:
 # Jobs for Clang builds on FreeBSD 13 (amd64)
 
 clang:freebsd13:amd64:
+  variables:
+    CC: clang
+    CFLAGS: "${CFLAGS_COMMON} -Og"
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
+    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
+    # incompatibility; see https://bugs.freebsd.org/275241.
+    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE} --with-gssapi=/usr/local/bin/krb5-config"
   <<: *build_job
-  <<: *freebsd_autoscaler_13_amd64
+  <<: *freebsd_autoscaler_13_amd64_tags
 
 system:clang:freebsd13:amd64:
-  <<: *system_test_job
-  <<: *freebsd_autoscaler_13_amd64
-  <<: *extra_system_tests_triggering_rules
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true
+  <<: *system_test_job
+  <<: *freebsd_autoscaler_13_amd64_tags
+  <<: *extra_system_tests_triggering_rules
 
 unit:clang:freebsd13:amd64:
-  <<: *unit_test_job
-  <<: *freebsd_autoscaler_13_amd64
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true
+  <<: *unit_test_job
+  <<: *freebsd_autoscaler_13_amd64_tags
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
 
 # Jobs for Clang builds on FreeBSD 14 (amd64)
 
 clang:freebsd14:amd64:
+  variables:
+    CC: clang
+    CFLAGS: "${CFLAGS_COMMON} -Og"
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
+    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
+    # incompatibility; see https://bugs.freebsd.org/275241.
+    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE} --with-gssapi=/usr/local/bin/krb5-config"
   <<: *build_job
-  <<: *freebsd_autoscaler_14_amd64
+  <<: *freebsd_autoscaler_14_amd64_tags
 
 system:clang:freebsd14:amd64:
-  <<: *system_test_job
-  <<: *freebsd_autoscaler_14_amd64
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
   needs:
     - job: clang:freebsd14:amd64
       artifacts: true
+  <<: *system_test_job
+  <<: *freebsd_autoscaler_14_amd64_tags
 
 unit:clang:freebsd14:amd64:
-  <<: *unit_test_job
-  <<: *freebsd_autoscaler_14_amd64
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
   needs:
     - job: clang:freebsd14:amd64
       artifacts: true
   retry: 1  # GL #4924
+  <<: *unit_test_job
+  <<: *freebsd_autoscaler_14_amd64_tags
 
 # Jobs for Clang builds on FreeBSD 15 (amd64)
 
 clang:freebsd15:amd64:
+  variables:
+    CC: clang
+    CFLAGS: "${CFLAGS_COMMON} -Og"
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
+    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
+    # incompatibility; see https://bugs.freebsd.org/275241.
+    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE} --with-gssapi=/usr/local/bin/krb5-config"
   <<: *build_job
-  <<: *freebsd_autoscaler_15_amd64
+  <<: *freebsd_autoscaler_15_amd64_tags
 
 system:clang:freebsd15:amd64:
-  <<: *system_test_job
-  <<: *freebsd_autoscaler_15_amd64
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
   needs:
     - job: clang:freebsd15:amd64
       artifacts: true
+  <<: *system_test_job
+  <<: *freebsd_autoscaler_15_amd64_tags
 
 unit:clang:freebsd15:amd64:
-  <<: *unit_test_job
-  <<: *freebsd_autoscaler_15_amd64
+  variables:
+    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
   needs:
     - job: clang:freebsd15:amd64
       artifacts: true
+  <<: *unit_test_job
+  <<: *freebsd_autoscaler_15_amd64_tags
 
 # Job producing a release directory