diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dc3f2460c..baee0919db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ stages:
 
 .freebsd-amd64: &freebsd_amd64
   tags:
-    - freebsd
+    - libvirt
     - amd64
 
 .linux-amd64: &linux_amd64
@@ -951,12 +951,16 @@ unit:pkcs11:sid:amd64:
 clang:freebsd11.3:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
+    USER: gitlab-runner
   <<: *freebsd_amd64
   <<: *build_job
 
 system:clang:freebsd11.3:amd64:
   <<: *freebsd_amd64
   <<: *system_test_job
+  variables:
+    USER: gitlab-runner
+    TEST_PARALLEL_JOBS: 4
   dependencies:
     - clang:freebsd11.3:amd64
   needs: ["clang:freebsd11.3:amd64"]
@@ -964,32 +968,40 @@ system:clang:freebsd11.3:amd64:
 unit:clang:freebsd11.3:amd64:
   <<: *freebsd_amd64
   <<: *unit_test_job
+  variables:
+    USER: gitlab-runner
   dependencies:
     - clang:freebsd11.3:amd64
   needs: ["clang:freebsd11.3:amd64"]
 
-# Jobs for Clang builds on FreeBSD 12.0 (amd64)
+# Jobs for Clang builds on FreeBSD 12.1 (amd64)
 
-clang:freebsd12.0:amd64:
+clang:freebsd12.1:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap"
+    USER: gitlab-runner
   <<: *freebsd_amd64
   <<: *build_job
 
-system:clang:freebsd12.0:amd64:
+system:clang:freebsd12.1:amd64:
   <<: *freebsd_amd64
   <<: *system_test_job
+  variables:
+    USER: gitlab-runner
+    TEST_PARALLEL_JOBS: 4
   dependencies:
-    - clang:freebsd12.0:amd64
-  needs: ["clang:freebsd12.0:amd64"]
+    - clang:freebsd12.1:amd64
+  needs: ["clang:freebsd12.1:amd64"]
 
-unit:clang:freebsd12.0:amd64:
+unit:clang:freebsd12.1:amd64:
   <<: *freebsd_amd64
   <<: *unit_test_job
+  variables:
+    USER: gitlab-runner
   dependencies:
-    - clang:freebsd12.0:amd64
-  needs: ["clang:freebsd12.0:amd64"]
+    - clang:freebsd12.1:amd64
+  needs: ["clang:freebsd12.1:amd64"]
 
 # Jobs for Clang builds on OpenBSD 6.6 (amd64)