diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg
index 20d832d4..716422a0 100644
--- a/master-nonlatent/master.cfg
+++ b/master-nonlatent/master.cfg
@@ -948,6 +948,15 @@ f_macos.addStep(
     )
 )
 
+# f_freebsd
+f_freebsd = getQuickBuildFactory(mtrDbPool)
+f_freebsd.addStep(
+    steps.ShellCommand(
+        name="cleanup",
+        command="rm -r /mnt/packages/* /buildbot/* 2> /dev/null || true",
+        alwaysRun=True,
+    )
+)
 
 ####### BUILDERS LIST
 c["builders"] = []
@@ -1027,8 +1036,9 @@ c["builders"].append(
         workernames=["hz-freebsd-bbw1"],
         tags=["FreeBSD", "quick"],
         collapseRequests=True,
+        properties={"additional_args": "-DPLUGIN_ROCKSDB=NO"},
         nextBuild=nextBuild,
-        factory=f_quick_build,
+        factory=f_freebsd,
     )
 )
 
diff --git a/utils.py b/utils.py
index d6099419..1c001e6e 100644
--- a/utils.py
+++ b/utils.py
@@ -30,7 +30,7 @@ def envFromProperties(envlist):
 
 
 def getScript(scriptname):
-    branch=os.getenv("BRANCH", default="main")
+    branch = os.getenv("BRANCH", default="main")
     return steps.ShellCommand(
         name=f"fetch_{scriptname}",
         command=[
@@ -153,7 +153,7 @@ def downloadSourceTarball(output_dir="/mnt/packages/"):
     # Do not use flock for AIX
     os=$(uname -s)
     use_flock=""
-    if [[ $os != "AIX" && $os != "Darwin" ]]; then
+    if [[ $os != "AIX" && $os != "Darwin" && $os != "FreeBSD" ]]; then
       use_flock="flock \"$d$f\" "
     fi
     cmd="$use_flock wget -cO \"$d$f\" \""""