diff --git a/.github/kokoro/continuous-db-artix7.cfg b/.github/kokoro/continuous-db-artix7.cfg
index a48eb6b7..aa641dea 100644
--- a/.github/kokoro/continuous-db-artix7.cfg
+++ b/.github/kokoro/continuous-db-artix7.cfg
@@ -7,8 +7,10 @@ timeout_mins: 4320
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
-    regex: "database/artix7/**"
+    regex: "**/build/**"
+    regex: "**/logs/**"
+    regex: "**/database/zynq7/**"
+    strip_prefix: "github/symbiflow-prjxray-continuous-db-artix7/"
   }
 }
 
diff --git a/.github/kokoro/continuous-db-kintex7.cfg b/.github/kokoro/continuous-db-kintex7.cfg
index fca573bf..b6f7f24e 100644
--- a/.github/kokoro/continuous-db-kintex7.cfg
+++ b/.github/kokoro/continuous-db-kintex7.cfg
@@ -7,8 +7,10 @@ timeout_mins: 4320
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
-    regex: "database/kintex7/**"
+    regex: "**/build/**"
+    regex: "**/logs/**"
+    regex: "**/database/zynq7/**"
+    strip_prefix: "github/symbiflow-prjxray-continuous-db-kintex7/"
   }
 }
 
diff --git a/.github/kokoro/continuous-db-zynq7.cfg b/.github/kokoro/continuous-db-zynq7.cfg
index 4f38df77..0e2d5a91 100644
--- a/.github/kokoro/continuous-db-zynq7.cfg
+++ b/.github/kokoro/continuous-db-zynq7.cfg
@@ -7,8 +7,10 @@ timeout_mins: 4320
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
-    regex: "database/zynq7/**"
+    regex: "**/build/**"
+    regex: "**/logs/**"
+    regex: "**/database/zynq7/**"
+    strip_prefix: "github/symbiflow-prjxray-continuous-db-zynq7/"
   }
 }
 
diff --git a/.github/kokoro/database.cfg b/.github/kokoro/database.cfg
index 762600a4..3097fda1 100644
--- a/.github/kokoro/database.cfg
+++ b/.github/kokoro/database.cfg
@@ -5,6 +5,9 @@ timeout_mins: 10
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
+    regex: "**/logs/**"
+    regex: "**/build/**"
+    regex: "**/database/**"
+    strip_prefix: "github/symbiflow-prjxray-db/"
   }
 }
diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index 65af5677..c64628b6 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -53,6 +53,7 @@ echo "----------------------------------------"
 	echo "----------------------------------------"
 
 	# Check there is nothing to do after running...
+	echo
 	if [ $(make --dry-run | grep -v 'Nothing to be done' | wc -l) -gt 0 ]; then
 		echo "The following targets need to still run!"
 		make --dry-run
@@ -60,6 +61,7 @@ echo "----------------------------------------"
 		echo "Debug output on why they still need to run"
 		make --dry-run --debug
 		echo "----------------------------------------"
+		exit 1
 	else
 		echo "All good, nothing more to do!"
 	fi
@@ -94,4 +96,19 @@ echo "----------------------------------------"
 echo "----------------------------------------"
 
 # Check the database and fail if it is broken.
-make checkdb-${XRAY_SETTINGS}
+#make checkdb-${XRAY_SETTINGS}
+
+# If we get here, then all the fuzzers completed fine. Hence we are
+# going to assume we don't want to keep all the build / logs / etc (as
+# they are quite large). Thus do a clean to get rid of them.
+echo
+echo "========================================"
+echo " Cleaning up after success"
+echo "----------------------------------------"
+(
+	cd fuzzers
+	echo
+	echo "Cleaning up so CI doesn't save all the excess data."
+	make clean
+)
+echo "----------------------------------------"
diff --git a/.github/kokoro/presubmit-db-artix7.cfg b/.github/kokoro/presubmit-db-artix7.cfg
index 27d76a16..a026e6e6 100644
--- a/.github/kokoro/presubmit-db-artix7.cfg
+++ b/.github/kokoro/presubmit-db-artix7.cfg
@@ -7,8 +7,10 @@ timeout_mins: 4320
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
-    regex: "database/artix7/**"
+    regex: "**/logs/**"
+    regex: "**/build/**"
+    regex: "**/database/artix7/**"
+    strip_prefix: "github/symbiflow-prjxray-presubmit-db-artix7/"
   }
 }
 
diff --git a/.github/kokoro/presubmit-db-kintex7.cfg b/.github/kokoro/presubmit-db-kintex7.cfg
index f5957068..c9f90bc6 100644
--- a/.github/kokoro/presubmit-db-kintex7.cfg
+++ b/.github/kokoro/presubmit-db-kintex7.cfg
@@ -7,8 +7,10 @@ timeout_mins: 4320
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
-    regex: "database/kintex7/**"
+    regex: "**/logs/**"
+    regex: "**/build/**"
+    regex: "**/database/kintex7/**"
+    strip_prefix: "github/symbiflow-prjxray-presubmit-db-kintex7/"
   }
 }
 
diff --git a/.github/kokoro/presubmit-db-zynq7.cfg b/.github/kokoro/presubmit-db-zynq7.cfg
index 11f748ac..176dec40 100644
--- a/.github/kokoro/presubmit-db-zynq7.cfg
+++ b/.github/kokoro/presubmit-db-zynq7.cfg
@@ -7,8 +7,10 @@ timeout_mins: 4320
 action {
   define_artifacts {
     regex: "**/*result*.xml"
-    regex: "**/*.log"
-    regex: "database/zynq7/**"
+    regex: "**/logs/**"
+    regex: "**/build/**"
+    regex: "**/database/zynq7/**"
+    strip_prefix: "github/symbiflow-prjxray-presubmit-db-zynq7/"
   }
 }