diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb0d8dd558..e45614d71a 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
@@ -927,12 +927,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"]
@@ -940,32 +944,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)
 
diff --git a/PLATFORMS b/PLATFORMS
index b19f1e3dcf..cd6a4ac027 100644
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -15,14 +15,14 @@ offer support on a "best effort" basis for some.
 
 Regularly tested platforms
 
-As of Feb 2020, BIND 9.14 is fully supported and regularly tested on the
+As of Mar 2020, BIND 9.14 is fully supported and regularly tested on the
 following systems:
 
   * Debian 8, 9, 10
   * Ubuntu LTS 16.04, 18.04
   * Fedora 31
   * Red Hat Enterprise Linux / CentOS 6, 7, 8
-  * FreeBSD 11.3, 12.0
+  * FreeBSD 11.3, 12.1
   * OpenBSD 6.6
   * Alpine Linux
 
diff --git a/PLATFORMS.md b/PLATFORMS.md
index e4cf6b82dc..efec412964 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -23,14 +23,14 @@ offer support on a "best effort" basis for some.
 
 ### Regularly tested platforms
 
-As of Feb 2020, BIND 9.14 is fully supported and regularly tested on the
+As of Mar 2020, BIND 9.14 is fully supported and regularly tested on the
 following systems:
 
 * Debian 8, 9, 10
 * Ubuntu LTS 16.04, 18.04
 * Fedora 31
 * Red Hat Enterprise Linux / CentOS 6, 7, 8
-* FreeBSD 11.3, 12.0
+* FreeBSD 11.3, 12.1
 * OpenBSD 6.6
 * Alpine Linux