diff --git a/.kokoro/node10/common.cfg b/.kokoro/continuous/node10/common.cfg
similarity index 100%
rename from .kokoro/node10/common.cfg
rename to .kokoro/continuous/node10/common.cfg
diff --git a/.kokoro/continuous/node10/docs.cfg b/.kokoro/continuous/node10/docs.cfg
new file mode 100644
index 00000000..c55dcc9f
--- /dev/null
+++ b/.kokoro/continuous/node10/docs.cfg
@@ -0,0 +1,4 @@
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-vision/.kokoro/docs.sh"
+}
diff --git a/.kokoro/continuous/node10/lint.cfg b/.kokoro/continuous/node10/lint.cfg
new file mode 100644
index 00000000..db497ccd
--- /dev/null
+++ b/.kokoro/continuous/node10/lint.cfg
@@ -0,0 +1,4 @@
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-vision/.kokoro/lint.sh"
+}
\ No newline at end of file
diff --git a/.kokoro/continuous.cfg b/.kokoro/continuous/node10/test.cfg
similarity index 100%
rename from .kokoro/continuous.cfg
rename to .kokoro/continuous/node10/test.cfg
diff --git a/.kokoro/node6/common.cfg b/.kokoro/continuous/node6/common.cfg
similarity index 100%
rename from .kokoro/node6/common.cfg
rename to .kokoro/continuous/node6/common.cfg
diff --git a/.kokoro/docs/continuous.cfg b/.kokoro/continuous/node6/test.cfg
similarity index 100%
rename from .kokoro/docs/continuous.cfg
rename to .kokoro/continuous/node6/test.cfg
diff --git a/.kokoro/node8/common.cfg b/.kokoro/continuous/node8/common.cfg
similarity index 100%
rename from .kokoro/node8/common.cfg
rename to .kokoro/continuous/node8/common.cfg
diff --git a/.kokoro/docs/presubmit.cfg b/.kokoro/continuous/node8/test.cfg
similarity index 100%
rename from .kokoro/docs/presubmit.cfg
rename to .kokoro/continuous/node8/test.cfg
diff --git a/.kokoro/node6/continuous.cfg b/.kokoro/node6/continuous.cfg
deleted file mode 100644
index e69de29b..00000000
diff --git a/.kokoro/node6/presubmit.cfg b/.kokoro/node6/presubmit.cfg
deleted file mode 100644
index e69de29b..00000000
diff --git a/.kokoro/node8/continuous.cfg b/.kokoro/node8/continuous.cfg
deleted file mode 100644
index e69de29b..00000000
diff --git a/.kokoro/node8/presubmit.cfg b/.kokoro/node8/presubmit.cfg
deleted file mode 100644
index e69de29b..00000000
diff --git a/.kokoro/docs/common.cfg b/.kokoro/presubmit/node10/common.cfg
similarity index 93%
rename from .kokoro/docs/common.cfg
rename to .kokoro/presubmit/node10/common.cfg
index 2323f5ad..8fbea794 100644
--- a/.kokoro/docs/common.cfg
+++ b/.kokoro/presubmit/node10/common.cfg
@@ -23,5 +23,5 @@ env_vars: {
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-vision/.kokoro/docs.sh"
+    value: "github/nodejs-vision/.kokoro/build.sh"
 }
diff --git a/.kokoro/presubmit/node10/docs.cfg b/.kokoro/presubmit/node10/docs.cfg
new file mode 100644
index 00000000..c55dcc9f
--- /dev/null
+++ b/.kokoro/presubmit/node10/docs.cfg
@@ -0,0 +1,4 @@
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-vision/.kokoro/docs.sh"
+}
diff --git a/.kokoro/lint/continuous.cfg b/.kokoro/presubmit/node10/lint.cfg
similarity index 100%
rename from .kokoro/lint/continuous.cfg
rename to .kokoro/presubmit/node10/lint.cfg
diff --git a/.kokoro/lint/presubmit.cfg b/.kokoro/presubmit/node10/test.cfg
similarity index 100%
rename from .kokoro/lint/presubmit.cfg
rename to .kokoro/presubmit/node10/test.cfg
diff --git a/.kokoro/lint/common.cfg b/.kokoro/presubmit/node6/common.cfg
similarity index 85%
rename from .kokoro/lint/common.cfg
rename to .kokoro/presubmit/node6/common.cfg
index 67c17796..98e611bc 100644
--- a/.kokoro/lint/common.cfg
+++ b/.kokoro/presubmit/node6/common.cfg
@@ -19,9 +19,9 @@ build_file: "nodejs-vision/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-vision/.kokoro/lint.sh"
+    value: "github/nodejs-vision/.kokoro/build.sh"
 }
diff --git a/.kokoro/node10/continuous.cfg b/.kokoro/presubmit/node6/test.cfg
similarity index 100%
rename from .kokoro/node10/continuous.cfg
rename to .kokoro/presubmit/node6/test.cfg
diff --git a/.kokoro/presubmit/node8/common.cfg b/.kokoro/presubmit/node8/common.cfg
new file mode 100644
index 00000000..e9dad394
--- /dev/null
+++ b/.kokoro/presubmit/node8/common.cfg
@@ -0,0 +1,27 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs"
+
+# Use the trampoline script to run in docker.
+build_file: "nodejs-vision/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-vision/.kokoro/build.sh"
+}
diff --git a/.kokoro/node10/presubmit.cfg b/.kokoro/presubmit/node8/test.cfg
similarity index 100%
rename from .kokoro/node10/presubmit.cfg
rename to .kokoro/presubmit/node8/test.cfg