diff --git a/.github/kokoro/continuous-db-artix7-quick.cfg b/.github/kokoro/continuous-db-artix7-quick.cfg
deleted file mode 100644
index 42d2b777..00000000
--- a/.github/kokoro/continuous-db-artix7-quick.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "symbiflow-prjxray-continuous-db-artix7-quick/.github/kokoro/db-quick.sh"
-
-timeout_mins: 180
-
-action {
-  define_artifacts {
-    regex: "**/*result*.xml"
-    regex: "**/*.log"
-  }
-}
-
-env_vars {
-  key: "KOKORO_TYPE"
-  value: "continuous"
-}
-
-env_vars {
-  key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-continuous-db-artix7-quick"
-}
-
-env_vars {
-  key: "XRAY_SETTINGS"
-  value: "artix7"
-}
-
-env_vars {
-  key: "XRAY_BUILD_TYPE"
-  value: "quick"
-}
diff --git a/.github/kokoro/continuous-db-artix7-full.cfg b/.github/kokoro/continuous-db-artix7.cfg
similarity index 73%
rename from .github/kokoro/continuous-db-artix7-full.cfg
rename to .github/kokoro/continuous-db-artix7.cfg
index 1048062e..a48eb6b7 100644
--- a/.github/kokoro/continuous-db-artix7-full.cfg
+++ b/.github/kokoro/continuous-db-artix7.cfg
@@ -1,6 +1,6 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-continuous-db-artix7-full/.github/kokoro/db-full.sh"
+build_file: "symbiflow-prjxray-continuous-db-artix7/.github/kokoro/db-full.sh"
 
 timeout_mins: 4320
 
@@ -19,7 +19,7 @@ env_vars {
 
 env_vars {
   key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-continuous-db-artix7-full"
+  value: "symbiflow-prjxray-continuous-db-artix7"
 }
 
 env_vars {
diff --git a/.github/kokoro/continuous-db-kintex7-quick.cfg b/.github/kokoro/continuous-db-kintex7-quick.cfg
deleted file mode 100644
index 3b67b337..00000000
--- a/.github/kokoro/continuous-db-kintex7-quick.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "symbiflow-prjxray-continuous-db-kintex7-quick/.github/kokoro/db-quick.sh"
-
-timeout_mins: 180
-
-action {
-  define_artifacts {
-    regex: "**/*result*.xml"
-    regex: "**/*.log"
-  }
-}
-
-env_vars {
-  key: "KOKORO_TYPE"
-  value: "continuous"
-}
-
-env_vars {
-  key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-continuous-db-kintex7-quick"
-}
-
-env_vars {
-  key: "XRAY_SETTINGS"
-  value: "kintex7"
-}
-
-env_vars {
-  key: "XRAY_BUILD_TYPE"
-  value: "quick"
-}
diff --git a/.github/kokoro/continuous-db-kintex7-full.cfg b/.github/kokoro/continuous-db-kintex7.cfg
similarity index 73%
rename from .github/kokoro/continuous-db-kintex7-full.cfg
rename to .github/kokoro/continuous-db-kintex7.cfg
index bceb827f..fca573bf 100644
--- a/.github/kokoro/continuous-db-kintex7-full.cfg
+++ b/.github/kokoro/continuous-db-kintex7.cfg
@@ -1,6 +1,6 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-continuous-db-kintex7-full/.github/kokoro/db-full.sh"
+build_file: "symbiflow-prjxray-continuous-db-kintex7/.github/kokoro/db-full.sh"
 
 timeout_mins: 4320
 
@@ -19,7 +19,7 @@ env_vars {
 
 env_vars {
   key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-continuous-db-kintex7-full"
+  value: "symbiflow-prjxray-continuous-db-kintex7"
 }
 
 env_vars {
diff --git a/.github/kokoro/continuous-db-zynq7-quick.cfg b/.github/kokoro/continuous-db-zynq7-quick.cfg
deleted file mode 100644
index 24cfb1bd..00000000
--- a/.github/kokoro/continuous-db-zynq7-quick.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "symbiflow-prjxray-continuous-db-zynq7-quick/.github/kokoro/db-quick.sh"
-
-timeout_mins: 180
-
-action {
-  define_artifacts {
-    regex: "**/*result*.xml"
-    regex: "**/*.log"
-  }
-}
-
-env_vars {
-  key: "KOKORO_TYPE"
-  value: "continuous"
-}
-
-env_vars {
-  key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-continuous-db-zynq7-quick"
-}
-
-env_vars {
-  key: "XRAY_SETTINGS"
-  value: "zynq7"
-}
-
-env_vars {
-  key: "XRAY_BUILD_TYPE"
-  value: "quick"
-}
diff --git a/.github/kokoro/continuous-db-zynq7-full.cfg b/.github/kokoro/continuous-db-zynq7.cfg
similarity index 74%
rename from .github/kokoro/continuous-db-zynq7-full.cfg
rename to .github/kokoro/continuous-db-zynq7.cfg
index 3e581974..4f38df77 100644
--- a/.github/kokoro/continuous-db-zynq7-full.cfg
+++ b/.github/kokoro/continuous-db-zynq7.cfg
@@ -1,6 +1,6 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-continuous-db-zynq7-full/.github/kokoro/db-full.sh"
+build_file: "symbiflow-prjxray-continuous-db-zynq7/.github/kokoro/db-full.sh"
 
 timeout_mins: 4320
 
@@ -19,7 +19,7 @@ env_vars {
 
 env_vars {
   key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-continuous-db-zynq7-full"
+  value: "symbiflow-prjxray-continuous-db-zynq7"
 }
 
 env_vars {
diff --git a/.github/kokoro/kokoro-cfg.py b/.github/kokoro/kokoro-cfg.py
index 2c0b5627..a89b1b53 100755
--- a/.github/kokoro/kokoro-cfg.py
+++ b/.github/kokoro/kokoro-cfg.py
@@ -1,44 +1,9 @@
 #!/usr/bin/env python3
 
-db_quick = """\
-# Format: //devtools/kokoro/config/proto/build.proto
-
-build_file: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s%(ext)s/.github/kokoro/db-quick.sh"
-
-timeout_mins: 180
-
-action {
-  define_artifacts {
-    regex: "**/*result*.xml"
-    regex: "**/*.log"
-  }
-}
-
-env_vars {
-  key: "KOKORO_TYPE"
-  value: "%(kokoro_type)s"
-}
-
-env_vars {
-  key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s%(ext)s"
-}
-
-env_vars {
-  key: "XRAY_SETTINGS"
-  value: "%(part)s"
-}
-
-env_vars {
-  key: "XRAY_BUILD_TYPE"
-  value: "quick"
-}
-"""
-
 db_full = """\
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s-full/.github/kokoro/db-full.sh"
+build_file: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s/.github/kokoro/db-full.sh"
 
 timeout_mins: 4320
 
@@ -57,7 +22,7 @@ env_vars {
 
 env_vars {
   key: "KOKORO_DIR"
-  value: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s-full"
+  value: "symbiflow-prjxray-%(kokoro_type)s-db-%(part)s"
 }
 
 env_vars {
@@ -72,20 +37,14 @@ env_vars {
 """
 
 for part in ['artix7', 'kintex7', 'zynq7']:
-    with open("continuous-db-%s-quick.cfg" % part, "w") as f:
-        f.write(
-            db_quick % {
-                'part': part,
-                'kokoro_type': 'continuous',
-                'ext': '-quick'
-            })
-    with open("continuous-db-%s-full.cfg" % part, "w") as f:
-        f.write(db_full % {'part': part, 'kokoro_type': 'continuous'})
+    with open("continuous-db-%s.cfg" % part, "w") as f:
+        f.write(db_full % {
+            'part': part,
+            'kokoro_type': 'continuous',
+        })
 
     with open("presubmit-db-%s.cfg" % part, "w") as f:
-        f.write(
-            db_quick % {
-                'part': part,
-                'kokoro_type': 'presubmit',
-                'ext': ''
-            })
+        f.write(db_full % {
+            'part': part,
+            'kokoro_type': 'presubmit',
+        })
diff --git a/.github/kokoro/presubmit-db-artix7.cfg b/.github/kokoro/presubmit-db-artix7.cfg
index c7ca90ff..27d76a16 100644
--- a/.github/kokoro/presubmit-db-artix7.cfg
+++ b/.github/kokoro/presubmit-db-artix7.cfg
@@ -1,13 +1,14 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-presubmit-db-artix7/.github/kokoro/db-quick.sh"
+build_file: "symbiflow-prjxray-presubmit-db-artix7/.github/kokoro/db-full.sh"
 
-timeout_mins: 180
+timeout_mins: 4320
 
 action {
   define_artifacts {
     regex: "**/*result*.xml"
     regex: "**/*.log"
+    regex: "database/artix7/**"
   }
 }
 
@@ -28,5 +29,5 @@ env_vars {
 
 env_vars {
   key: "XRAY_BUILD_TYPE"
-  value: "quick"
+  value: "full"
 }
diff --git a/.github/kokoro/presubmit-db-kintex7.cfg b/.github/kokoro/presubmit-db-kintex7.cfg
index 3a501168..f5957068 100644
--- a/.github/kokoro/presubmit-db-kintex7.cfg
+++ b/.github/kokoro/presubmit-db-kintex7.cfg
@@ -1,13 +1,14 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-presubmit-db-kintex7/.github/kokoro/db-quick.sh"
+build_file: "symbiflow-prjxray-presubmit-db-kintex7/.github/kokoro/db-full.sh"
 
-timeout_mins: 180
+timeout_mins: 4320
 
 action {
   define_artifacts {
     regex: "**/*result*.xml"
     regex: "**/*.log"
+    regex: "database/kintex7/**"
   }
 }
 
@@ -28,5 +29,5 @@ env_vars {
 
 env_vars {
   key: "XRAY_BUILD_TYPE"
-  value: "quick"
+  value: "full"
 }
diff --git a/.github/kokoro/presubmit-db-zynq7.cfg b/.github/kokoro/presubmit-db-zynq7.cfg
index 6026b61e..11f748ac 100644
--- a/.github/kokoro/presubmit-db-zynq7.cfg
+++ b/.github/kokoro/presubmit-db-zynq7.cfg
@@ -1,13 +1,14 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-build_file: "symbiflow-prjxray-presubmit-db-zynq7/.github/kokoro/db-quick.sh"
+build_file: "symbiflow-prjxray-presubmit-db-zynq7/.github/kokoro/db-full.sh"
 
-timeout_mins: 180
+timeout_mins: 4320
 
 action {
   define_artifacts {
     regex: "**/*result*.xml"
     regex: "**/*.log"
+    regex: "database/zynq7/**"
   }
 }
 
@@ -28,5 +29,5 @@ env_vars {
 
 env_vars {
   key: "XRAY_BUILD_TYPE"
-  value: "quick"
+  value: "full"
 }