diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4143d4832b..13cf945c9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,6 +173,10 @@ stages:
   image: "freebsd-12.2-x86_64"
   <<: *libvirt_amd64
 
+.freebsd-13-amd64: &freebsd_13_amd64_image
+  image: "freebsd-13.0-x86_64"
+  <<: *libvirt_amd64
+
 .openbsd-amd64: &openbsd_amd64_image
   image: "openbsd-6.9-x86_64"
   <<: *libvirt_amd64
@@ -195,6 +199,12 @@ stages:
     - main@isc-projects/bind9
     - /^v9_[1-9][0-9]$/@isc-projects/bind9
 
+.schedules-tags-web-triggering-rules: &schedules_tags_web_triggering_rules
+  only:
+    - schedules
+    - tags
+    - web
+
 .precheck: &precheck_job
   <<: *default_triggering_rules
   <<: *base_image
@@ -353,6 +363,7 @@ stages:
     when: on_failure
 
 .windows_system_test: &windows_system_test_job
+  <<: *schedules_tags_web_triggering_rules
   stage: system
   script:
     - 'Push-Location bin/tests/system'
@@ -368,10 +379,6 @@ stages:
     untracked: true
     expire_in: "1 day"
     when: on_failure
-  only:
-    - schedules
-    - tags
-    - web
 
 .unit_test_common: &unit_test_common
   <<: *default_triggering_rules
@@ -782,10 +789,7 @@ system:gcc:out-of-tree:
       artifacts: true
   <<: *base_image
   <<: *system_test_job
-  only:
-    - schedules
-    - tags
-    - web
+  <<: *schedules_tags_web_triggering_rules
 
 unit:gcc:out-of-tree:
   variables:
@@ -795,10 +799,7 @@ unit:gcc:out-of-tree:
       artifacts: true
   <<: *base_image
   <<: *unit_test_job
-  only:
-    - schedules
-    - tags
-    - web
+  <<: *schedules_tags_web_triggering_rules
 
 # Jobs for tarball GCC builds on Debian 10 "buster" (amd64)
 
@@ -816,37 +817,27 @@ gcc:tarball:
   needs:
     - job: tarball-create
       artifacts: true
-  only:
-    - schedules
-    - tags
-    - web
 
 system:gcc:tarball:
   <<: *base_image
   <<: *system_test_job
+  <<: *schedules_tags_web_triggering_rules
   before_script:
     - cd bind-*
     - *setup_interfaces
   needs:
     - job: gcc:tarball
       artifacts: true
-  only:
-    - schedules
-    - tags
-    - web
 
 unit:gcc:tarball:
   <<: *base_image
   <<: *unit_test_job
+  <<: *schedules_tags_web_triggering_rules
   before_script:
     - cd bind-*
   needs:
     - job: gcc:tarball
       artifacts: true
-  only:
-    - schedules
-    - tags
-    - web
 
 # Jobs for debug GCC builds on openSUSE Tumbleweed (amd64)
 
@@ -1112,10 +1103,12 @@ clang:freebsd11:amd64:
     USER: gitlab-runner
   <<: *freebsd_11_amd64_image
   <<: *build_job
+  <<: *schedules_tags_web_triggering_rules
 
 system:clang:freebsd11:amd64:
   <<: *freebsd_11_amd64_image
   <<: *system_test_job
+  <<: *schedules_tags_web_triggering_rules
   variables:
     USER: gitlab-runner
     TEST_PARALLEL_JOBS: 4
@@ -1126,6 +1119,7 @@ system:clang:freebsd11:amd64:
 unit:clang:freebsd11:amd64:
   <<: *freebsd_11_amd64_image
   <<: *unit_test_job
+  <<: *schedules_tags_web_triggering_rules
   needs:
     - job: clang:freebsd11:amd64
       artifacts: true
@@ -1157,6 +1151,33 @@ unit:clang:freebsd12:amd64:
     - job: clang:freebsd12:amd64
       artifacts: true
 
+# Jobs for Clang builds on FreeBSD 13 (amd64)
+
+clang:freebsd13:amd64:
+  variables:
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "${WITH_READLINE_LIBEDIT}"
+    USER: gitlab-runner
+  <<: *freebsd_13_amd64_image
+  <<: *build_job
+
+system:clang:freebsd13:amd64:
+  <<: *freebsd_13_amd64_image
+  <<: *system_test_job
+  variables:
+    USER: gitlab-runner
+    TEST_PARALLEL_JOBS: 4
+  needs:
+    - job: clang:freebsd13:amd64
+      artifacts: true
+
+unit:clang:freebsd13:amd64:
+  <<: *freebsd_13_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: clang:freebsd13:amd64
+      artifacts: true
+
 # Jobs for Clang builds on OpenBSD (amd64)
 
 clang:openbsd:amd64:
@@ -1211,12 +1232,9 @@ system:msvc:windows:amd64:
 msvc-debug:windows:amd64:
   <<: *windows_server_2016_amd64_image
   <<: *windows_build_job
+  <<: *schedules_tags_web_triggering_rules
   variables:
     VSCONF: Debug
-  only:
-    - schedules
-    - tags
-    - web
 
 system:msvc-debug:windows:amd64:
   <<: *windows_server_2016_amd64_image
diff --git a/PLATFORMS.md b/PLATFORMS.md
index 6276a34e31..6130167a03 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -49,7 +49,7 @@ following systems:
 * Ubuntu LTS 16.04, 20.04
 * Fedora 33
 * Red Hat Enterprise Linux / CentOS 7, 8
-* FreeBSD 11.4, 12.2
+* FreeBSD 11.4, 12.2, 13.0
 * OpenBSD 6.9
 * Alpine Linux 3.13